[polari] Drop config JS module
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [polari] Drop config JS module
- Date: Mon, 23 Feb 2015 05:14:24 +0000 (UTC)
commit 5b4110232ab56fa47189cb44526ee4f34d122a8e
Author: Florian Müllner <fmuellner gnome org>
Date: Mon Feb 23 00:09:03 2015 +0100
Drop config JS module
The gjs package module already sets up all the config variables
we need.
src/Makefile.am | 13 +------------
src/application.js | 7 +++----
2 files changed, 4 insertions(+), 16 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index e680c6d..b1138d3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,9 +13,7 @@ typelib_DATA = $(gir_DATA:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
-do_subst = sed -e 's|@localedir[ ]|$(localedir)|g' \
- -e 's|@pkgdatadir[ ]|$(pkgdatadir)|g' \
- -e 's|@prefix[ ]|$(prefix)|g' \
+do_subst = sed -e 's|@prefix[ ]|$(prefix)|g' \
-e 's|@libdir[ ]|$(libdir)|g' \
-e 's|@GJS_CONSOLE[ ]|$(GJS_CONSOLE)|g' \
-e 's|@PACKAGE_NAME[ ]|$(PACKAGE_NAME)|g' \
@@ -49,19 +47,10 @@ dist_js_DATA = \
utils.js \
$(NULL)
-config.js: config.js.in Makefile
- $(AM_V_GEN) $(do_subst) $< > $@
-
-nodist_js_DATA = \
- config.js \
- $(NULL)
-
EXTRA_DIST += \
- config.js.in \
polari.in \
$(NULL)
CLEANFILES += \
- config.js \
polari \
$(NULL)
diff --git a/src/application.js b/src/application.js
index 2d711a8..cdef000 100644
--- a/src/application.js
+++ b/src/application.js
@@ -12,7 +12,6 @@ const Tp = imports.gi.TelepathyGLib;
const AccountsMonitor = imports.accountsMonitor;
const AppNotifications = imports.appNotifications;
const ChatroomManager = imports.chatroomManager;
-const Config = imports.config;
const Connections = imports.connections;
const Format = imports.format;
const Gettext = imports.gettext;
@@ -36,7 +35,7 @@ const Application = new Lang.Class({
_init: function() {
this.parent({ application_id: 'org.gnome.Polari' });
- Gettext.bindtextdomain('polari', Config.LOCALE_DIR);
+ Gettext.bindtextdomain('polari', pkg.localedir);
Gettext.textdomain('polari');
GLib.set_prgname('org.gnome.Polari');
GLib.set_application_name('Polari');
@@ -45,7 +44,7 @@ const Application = new Lang.Class({
},
vfunc_startup: function() {
- let resource = Gio.Resource.load(Config.RESOURCE_DIR + '/polari.gresource');
+ let resource = Gio.Resource.load(pkg.pkgdatadir + '/polari.gresource');
resource._register();
this.parent();
@@ -455,7 +454,7 @@ const Application = new Lang.Class({
license_type: Gtk.License.GPL_2_0,
logo_icon_name: 'polari',
wrap_license: true,
- version: Config.PACKAGE_VERSION,
+ version: pkg.version,
transient_for: this._window.window,
modal: true
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]