Merge lp:~townsend/compiz/fix-lp1063617 into lp:compiz/0.9.11

[Christopher Townsend]

Fix issue where custom keyboard shortcuts would get reset to defaults when rebooting or restarting Compiz.

Fix issue where custom keyboard shortcuts would get reset to defaults when rebooting or restarting Compiz.

A big thanks goes out to Lukas Vacek who is a community member that fixed this bug!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3861
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/76/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-utopic-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/76/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

Nice looks good to me.

review: Approve

=== modified file 'compizconfig/gsettings/src/gsettings.c'
--- compizconfig/gsettings/src/gsettings.c	2013-02-20 14:05:36 +0000
+++ compizconfig/gsettings/src/gsettings.c	2014-05-21 18:05:40 +0000
@@ -423,13 +423,19 @@
 static void
 updateSetting (CCSBackend *backend, CCSContext *context, CCSPlugin *plugin, CCSSetting *setting)
 {
+    Bool status;
     CCSIntegratedSetting *integrated = ccsGSettingsBackendGetIntegratedSetting (backend, setting);
 
-    ccsBackendReadInit (backend, context);
-    if (!readOption (backend, setting))
+    if (ccsGetIntegrationEnabled (context) &&
+	integrated)
     {
+	status = readIntegratedOption (backend, setting, integrated);
+    }
+    else
+	status = readOption (backend, setting);
+
+    if (!status)
 	ccsResetToDefault (setting, TRUE);
-    }
 
     if (ccsGetIntegrationEnabled (context) &&
 	integrated)
 
=== modified file 'compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c'
--- compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c	2014-03-04 20:00:28 +0000
+++ compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c	2014-05-21 18:05:40 +0000
@@ -244,8 +244,6 @@
     /* g_settings_set_value consumes the reference */
     if (newVariant)
 	ccsGSettingsWrapperSetValue (priv->wrapper, gsettingsTranslatedName, newVariant);
-    else
-	ccsGSettingsWrapperResetKey (priv->wrapper, gsettingsTranslatedName);
 
     g_variant_unref (variant);
     free (gsettingsTranslatedName);