Common: merge to fix

GSConnect · Dec 22, 2017 · ba1ffbb · ba1ffbb
1 parent 7848067
commit ba1ffbb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/client.js b/src/client.js
@@ -450,7 +450,7 @@ var Device = new Lang.Class({
         this.daemon = daemon;
 
         this.settings = new Gio.Settings({
-            settings_schema: Common.SchemaSource.lookup(
+            settings_schema: ext.gschema.lookup(
                 "org.gnome.Shell.Extensions.GSConnect.Device",
                 true
             ),

diff --git a/src/common.js b/src/common.js
@@ -29,24 +29,24 @@ for (let path of [ext.cachedir, ext.configdir, ext.runtimedir]) {
 /**
  * Init GSettings
  */
-var SchemaSource = Gio.SettingsSchemaSource.new_from_directory(
+ext.gschema = Gio.SettingsSchemaSource.new_from_directory(
     GLib.build_filenamev([ext.datadir, "schemas"]),
     Gio.SettingsSchemaSource.get_default(),
     false
 );
 
-    settings_schema: SchemaSource.lookup(ext.app_id, true)
 ext.settings = new Gio.Settings({
+    settings_schema: ext.gschema.lookup(ext.app_id, true)
 });
 
 
 /**
  * Register resources
  */
-var Resource = Gio.Resource.load(
+ext.resource = Gio.Resource.load(
     GLib.build_filenamev([ext.datadir, ext.app_id + ".data.gresource"])
 );
-Resource._register();
+ext.resource._register();
 
 
 /**
@@ -77,10 +77,10 @@ window.debug = function (msg) {
  * Check if a command is in the PATH
  * @param {string} name - the name of the command
  */
-function checkCommand (name) {
+function checkCommand (cmd) {
     let proc = GLib.spawn_async_with_pipes(
         null,                           // working dir
-        ["which", name],                // argv
+        ["which", cmd],                // argv
         null,                           // envp
         GLib.SpawnFlags.SEARCH_PATH,    // enables PATH
         null                            // child_setup (func)
@@ -103,8 +103,8 @@ function checkCommand (name) {
  */
 function getCertificate (id) {
     let settings = new Gio.Settings({
-        settings_schema: SchemaSource.lookup(ext.app_id + ".Device", true),
-        path: "/org/gnome/shell/extensions/gsconnect/device/" + id + "/"
+        settings_schema: ext.gschema.lookup(ext.app_id + ".Device", true),
+        path: ext.settings.path + "device/" + id + "/"
     });
 
     if (settings.get_string("certificate-pem")) {

diff --git a/src/service/device.js b/src/service/device.js
@@ -100,7 +100,7 @@ var Device = new Lang.Class({
 
         // GSettings
         this.settings = new Gio.Settings({
-            settings_schema: Common.SchemaSource.lookup(
+            settings_schema: ext.gschema.lookup(
                 "org.gnome.Shell.Extensions.GSConnect.Device",
                 true
             ),

diff --git a/src/service/plugins/base.js b/src/service/plugins/base.js
@@ -39,7 +39,7 @@ var Plugin = new Lang.Class({
         // Init GSettings
         if (imports.service.plugins[name].SettingsDialog) {
             this.settings = new Gio.Settings({
-                settings_schema: Common.SchemaSource.lookup(metadata.uuid, -1),
+                settings_schema: ext.gschema.lookup(metadata.uuid, -1),
                 path: ext.settings.path + "device/" + device.id + "/plugin/" + name + "/"
             });
         }
@@ -75,7 +75,7 @@ var SettingsDialog = new Lang.Class({
         let metadata = imports.service.plugins[name].METADATA;
 
         this.settings = new Gio.Settings({
-            settings_schema: Common.SchemaSource.lookup(metadata.uuid, -1),
+            settings_schema: ext.gschema.lookup(metadata.uuid, -1),
             path: ext.settings.path + "device/" + device.id + "/plugin/" + name + "/"
         });
         this.settings.delay();