Compiz

Merge lp:~compiz-team/compiz/compiz.fix_1169172 into lp:compiz/0.9.10

  1. compiz.fix_1169172
  2. Merge into 0.9.10
Proposed by Sam Spilsbury
Status: Merged
Approved by: Sam Spilsbury
Approved revision: 3657
Merged at revision: 3659
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1169172
Merge into: lp:compiz/0.9.10
Diff against target: 12 lines (+1/-1)
1 file modified
gtk/window-decorator/settings.c (+1/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1169172
Reviewer Review Type Date Requested Status
MC Return Approve
PS Jenkins bot (community) continuous-integration Approve
Compiz Maintainers Pending
Review via email: mp+159055@code.launchpad.net

Commit message

Check for USE_GCONF if USE_GSETTINGS is unavailable when instantiating
different types of settings objects.

(LP: #1169172)

Description of the change

Check for USE_GCONF if USE_GSETTINGS is unavailable when instantiating
different types of settings objects.

(LP: #1169172)

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

PASSED: Continuous integration, rev:3657
http://jenkins.qa.ubuntu.com/job/compiz-ci/133/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=raring,flavor=amd64/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-pbuilder/./build=pbuilder,distribution=raring,flavor=amd64/522

Click here to trigger a rebuild:
http://s-jenkins:8080/job/compiz-ci/133/rebuild

review: Approve (continuous-integration)
Revision history for this message
MC Return (mc-return) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gtk/window-decorator/settings.c'
2--- gtk/window-decorator/settings.c 2012-08-28 04:45:17 +0000
3+++ gtk/window-decorator/settings.c 2013-04-16 00:58:32 +0000
4@@ -57,7 +57,7 @@
5 gwd_connect_org_gnome_mutter_settings (mutter, storage);
6 gwd_connect_org_gnome_desktop_wm_preferences_settings (gnome, storage);
7 #else
8-#ifdef USE_GSETTINGS
9+#ifdef USE_GCONF
10 #define STORAGE_USED
11 storage = gwd_settings_storage_gconf_new (writable);
12 #endif

Subscribers

People subscribed via source and target branches

to all changes: