From 12a678cfa3bd88a55564f8e6459c17ce86e674c8 Mon Sep 17 00:00:00 2001 From: Kevin James Date: Thu, 12 Oct 2017 21:11:11 -0700 Subject: [PATCH] style(lib): code cleanup --- transmission-daemon@patapon.info/lib.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/transmission-daemon@patapon.info/lib.js b/transmission-daemon@patapon.info/lib.js index f2e2d62..090438b 100644 --- a/transmission-daemon@patapon.info/lib.js +++ b/transmission-daemon@patapon.info/lib.js @@ -21,20 +21,19 @@ function getSettings(extension) { let schemaName = 'org.gnome.shell.extensions.transmission-daemon'; let schemaDir = extension.dir.get_child('schemas').get_path(); - // Extension installed in .local if (GLib.file_test(schemaDir + '/gschemas.compiled', GLib.FileTest.EXISTS)) { - let schemaSource = Gio.SettingsSchemaSource.new_from_directory(schemaDir, - Gio.SettingsSchemaSource.get_default(), - false); + // extension installed in .local + let schemaSource = Gio.SettingsSchemaSource.new_from_directory( + schemaDir, Gio.SettingsSchemaSource.get_default(), false); let schema = schemaSource.lookup(schemaName, false); return new Gio.Settings({ settings_schema: schema, }); - } - // Extension installed system-wide - else { - if (Gio.Settings.list_schemas().indexOf(schemaName) == -1) { + } else { + // extension installed system-wide + if (Gio.Settings.list_schemas().indexOf(schemaName) === -1) { throw "Schema \"%s\" not found.".format(schemaName); } + return new Gio.Settings({ schema: schemaName, }); } } @@ -42,12 +41,11 @@ function getSettings(extension) { function initTranslations(extension) { let localeDir = extension.dir.get_child('locale').get_path(); - // Extension installed in .local if (GLib.file_test(localeDir, GLib.FileTest.EXISTS)) { + // extension installed in .local Gettext.bindtextdomain('gnome-shell-extension-transmission-daemon', localeDir); - } - // Extension installed system-wide - else { + } else { + // extension installed system-wide Gettext.bindtextdomain('gnome-shell-extension-transmission-daemon', extension.metadata.locale); } }