diff --git a/gnome-shell-extension-openweather.cbp b/gnome-shell-extension-openweather.cbp
index 3b454cd..56f9514 100644
--- a/gnome-shell-extension-openweather.cbp
+++ b/gnome-shell-extension-openweather.cbp
@@ -74,7 +74,6 @@
-
diff --git a/src/Makefile.am b/src/Makefile.am
index eafbe15..675e37b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,6 @@ uuid = openweather-extension@jenslody.de
extensiondir = $(topextensiondir)/$(uuid)
-dist_extension_DATA = extension.js darksky_net.js openweathermap_org.js convenience.js prefs.js
+dist_extension_DATA = extension.js darksky_net.js openweathermap_org.js prefs.js
nodist_extension_DATA = $(EXTRA_EXTENSION)
diff --git a/src/convenience.js b/src/convenience.js
deleted file mode 100644
index 054dafe..0000000
--- a/src/convenience.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/* jshint esnext:true */
-/* -*- mode: js -*- */
-/*
- Copyright (c) 2011-2012, Giovanni Campagna
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the GNOME nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-const Gettext = imports.gettext;
-const Gio = imports.gi.Gio;
-
-const Config = imports.misc.config;
-const ExtensionUtils = imports.misc.extensionUtils;
-
-/**
- * initTranslations:
- * @domain: (optional): the gettext domain to use
- *
- * Initialize Gettext to load translations from extensionsdir/locale.
- * If @domain is not provided, it will be taken from metadata['gettext-domain']
- */
-function initTranslations(domain) {
- let extension = ExtensionUtils.getCurrentExtension();
-
- domain = domain || extension.metadata['gettext-domain'];
-
- // check if this extension was built with "make zip-file", and thus
- // has the locale files in a subfolder
- // otherwise assume that extension has been installed in the
- // same prefix as gnome-shell
- let localeDir = extension.dir.get_child('locale');
- if (localeDir.query_exists(null))
- Gettext.bindtextdomain(domain, localeDir.get_path());
- else
- Gettext.bindtextdomain(domain, Config.LOCALEDIR);
-}
-
-/**
- * getSettings:
- * @schema: (optional): the GSettings schema id
- *
- * Builds and return a GSettings schema for @schema, using schema files
- * in extensionsdir/schemas. If @schema is not provided, it is taken from
- * metadata['settings-schema'].
- */
-function getSettings(schema) {
- let extension = ExtensionUtils.getCurrentExtension();
-
- schema = schema || extension.metadata['settings-schema'];
-
- const GioSSS = Gio.SettingsSchemaSource;
-
- // check if this extension was built with "make zip-file", and thus
- // has the schema files in a subfolder
- // otherwise assume that extension has been installed in the
- // same prefix as gnome-shell (and therefore schemas are available
- // in the standard folders)
- let schemaDir = extension.dir.get_child('schemas');
- let schemaSource;
- if (schemaDir.query_exists(null))
- schemaSource = GioSSS.new_from_directory(schemaDir.get_path(),
- GioSSS.get_default(),
- false);
- else
- schemaSource = GioSSS.get_default();
-
- let schemaObj = schemaSource.lookup(schema, true);
- if (!schemaObj)
- throw new Error('Schema ' + schema + ' could not be found for extension ' + extension.metadata.uuid + '. Please check your installation.');
-
- return new Gio.Settings({
- settings_schema: schemaObj
- });
-}
diff --git a/src/extension.js b/src/extension.js
index 63ecdd5..3e291df 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -39,7 +39,6 @@
const ExtensionUtils = imports.misc.extensionUtils;
const Me = ExtensionUtils.getCurrentExtension();
const Config = imports.misc.config;
-const Convenience = Me.imports.convenience;
const DarkskyNet = Me.imports.darksky_net;
const OpenweathermapOrg = Me.imports.openweathermap_org;
const Clutter = imports.gi.Clutter;
@@ -467,7 +466,7 @@ const OpenweatherMenuButton = new Lang.Class({
},
loadConfig: function() {
- this._settings = Convenience.getSettings(OPENWEATHER_SETTINGS_SCHEMA);
+ this._settings = ExtensionUtils.getSettings(OPENWEATHER_SETTINGS_SCHEMA);
if (this._cities.length === 0)
this._cities = "-8.5211767,179.1976747>Vaiaku, Tuvalu>-1";
@@ -492,7 +491,7 @@ const OpenweatherMenuButton = new Lang.Class({
},
loadConfigInterface: function() {
- this._settingsInterface = Convenience.getSettings(OPENWEATHER_DESKTOP_INTERFACE);
+ this._settingsInterface = ExtensionUtils.getSettings(OPENWEATHER_DESKTOP_INTERFACE);
this._settingsInterfaceC = this._settingsInterface.connect("changed", Lang.bind(this, function() {
this.rebuildCurrentWeatherUi();
this.rebuildFutureWeatherUi();
@@ -1693,7 +1692,7 @@ const OpenweatherMenuButton = new Lang.Class({
let openweatherMenu;
function init() {
- Convenience.initTranslations('gnome-shell-extension-openweather');
+ ExtensionUtils.initTranslations('gnome-shell-extension-openweather');
}
function enable() {
diff --git a/src/prefs.js b/src/prefs.js
index 65318a6..889b4c7 100644
--- a/src/prefs.js
+++ b/src/prefs.js
@@ -41,7 +41,6 @@ const Mainloop = imports.mainloop;
const ExtensionUtils = imports.misc.extensionUtils;
const Me = ExtensionUtils.getCurrentExtension();
const Config = imports.misc.config;
-const Convenience = Me.imports.convenience;
const EXTENSIONDIR = Me.dir.get_path();
@@ -713,7 +712,7 @@ const WeatherPrefsWidget = new GObject.Class({
},
loadConfig: function() {
- this.Settings = Convenience.getSettings(OPENWEATHER_SETTINGS_SCHEMA);
+ this.Settings = ExtensionUtils.getSettings(OPENWEATHER_SETTINGS_SCHEMA);
this.Settings.connect("changed", Lang.bind(this, function() {
this.refreshUI();
}));
@@ -1113,7 +1112,7 @@ const WeatherPrefsWidget = new GObject.Class({
});
function init() {
- Convenience.initTranslations('gnome-shell-extension-openweather');
+ ExtensionUtils.initTranslations('gnome-shell-extension-openweather');
}
function buildPrefsWidget() {