Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge remote-tracking branch 'javihernandez/GPII-8' into GPII-8

  • Loading branch information...
commit 287698fa072ce5e134dbc814b4bc895a8926fc30 2 parents 65fbae5 + 6830aac
Steven Githens sgithens authored
Showing with 7 additions and 2 deletions.
  1. +7 −2 node_modules/gsettingsBridge/gsettings_bridge.js
9 node_modules/gsettingsBridge/gsettings_bridge.js
View
@@ -54,8 +54,9 @@ https://github.com/gpii/universal/LICENSE.txt
for (var j = 0; j < app[appId].length; j++) {
var schemaId = app[appId][j].options.schema;
var settings = app[appId][j].settings;
+ var keys = nodeGSettings.get_gsetting_keys(schemaId);
+
if (settings === null) {
- var keys = nodeGSettings.get_gsetting_keys(schemaId);
app[appId][j].settings = {};
for (var k = 0; k < keys.length; k++) {
var key = keys[k];
@@ -64,6 +65,7 @@ https://github.com/gpii/universal/LICENSE.txt
}
else {
for (var settingKey in settings) {
+ if (keys.indexOf(settingKey) == -1) continue;
settings[settingKey] = nodeGSettings.get_gsetting(schemaId,settingKey);
}
@@ -79,7 +81,10 @@ https://github.com/gpii/universal/LICENSE.txt
for (var j = 0; j < app[appId].length; j++) {
var schemaId = app[appId][j].options.schema;
var settings = app[appId][j].settings;
+ var keys = nodeGSettings.get_gsetting_keys(schemaId);
+
for (var settingKey in settings) {
+ if (keys.indexOf(settingKey) == -1) continue;
var value = settings[settingKey];
var oldValue = nodeGSettings.get_gsetting(schemaId,settingKey);
nodeGSettings.set_gsetting(schemaId,settingKey,value);
@@ -93,4 +98,4 @@ https://github.com/gpii/universal/LICENSE.txt
return app;
}
-})();
+})();
Please sign in to comment.
Something went wrong with that request. Please try again.