Compiz

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

  1. fix-lp1063617
  2. Merge into 0.9.11
Proposed by Christopher Townsend
Status: Merged
Approved by: Brandon Schaefer
Approved revision: 3861
Merged at revision: 3867
Proposed branch: lp:~townsend/compiz/fix-lp1063617
Merge into: lp:compiz/0.9.11
Diff against target: 39 lines (+9/-5)
2 files modified
compizconfig/gsettings/src/gsettings.c (+9/-3)
compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c (+0/-2)
To merge this branch: bzr merge lp:~townsend/compiz/fix-lp1063617
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+220515@code.launchpad.net

Commit message

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

Description of the change

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!

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Nice looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'compizconfig/gsettings/src/gsettings.c'
2--- compizconfig/gsettings/src/gsettings.c 2013-02-20 14:05:36 +0000
3+++ compizconfig/gsettings/src/gsettings.c 2014-05-21 18:05:40 +0000
4@@ -423,13 +423,19 @@
5 static void
6 updateSetting (CCSBackend *backend, CCSContext *context, CCSPlugin *plugin, CCSSetting *setting)
7 {
8+ Bool status;
9 CCSIntegratedSetting *integrated = ccsGSettingsBackendGetIntegratedSetting (backend, setting);
10
11- ccsBackendReadInit (backend, context);
12- if (!readOption (backend, setting))
13+ if (ccsGetIntegrationEnabled (context) &&
14+ integrated)
15 {
16+ status = readIntegratedOption (backend, setting, integrated);
17+ }
18+ else
19+ status = readOption (backend, setting);
20+
21+ if (!status)
22 ccsResetToDefault (setting, TRUE);
23- }
24
25 if (ccsGetIntegrationEnabled (context) &&
26 integrated)
27
28=== modified file 'compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c'
29--- compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c 2014-03-04 20:00:28 +0000
30+++ compizconfig/integration/gnome/gsettings/src/ccs_gnome_integration_gsettings_integrated_setting.c 2014-05-21 18:05:40 +0000
31@@ -244,8 +244,6 @@
32 /* g_settings_set_value consumes the reference */
33 if (newVariant)
34 ccsGSettingsWrapperSetValue (priv->wrapper, gsettingsTranslatedName, newVariant);
35- else
36- ccsGSettingsWrapperResetKey (priv->wrapper, gsettingsTranslatedName);
37
38 g_variant_unref (variant);
39 free (gsettingsTranslatedName);

Subscribers

People subscribed via source and target branches