Merge lp:~compiz-team/compiz/compiz.fix_1048551 into lp:compiz/0.9.8

Proposed by Sam Spilsbury
Status: Merged
Approved by: Daniel van Vugt
Approved revision: 3361
Merged at revision: 3366
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1048551
Merge into: lp:compiz/0.9.8
Diff against target: 12 lines (+1/-1)
1 file modified
gtk/window-decorator/gwd-settings-storage-gsettings.c (+1/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1048551
Reviewer Review Type Date Requested Status
Daniel van Vugt Approve
jenkins (community) continuous-integration Approve
Review via email: mp+123514@code.launchpad.net

Commit message

Fixed: Check if org.gnome.mutter is available before using it

(LP: #1048551)

Description of the change

Fixed: Check if org.gnome.mutter is available before using it

Already covered by tests in test_gwd_settings.cpp

(LP: #1048551)

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :
review: Approve (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Seems to work.

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/gwd-settings-storage-gsettings.c'
2--- gtk/window-decorator/gwd-settings-storage-gsettings.c 2012-09-06 10:08:25 +0000
3+++ gtk/window-decorator/gwd-settings-storage-gsettings.c 2012-09-10 09:24:20 +0000
4@@ -125,7 +125,7 @@
5 GWDSettingsStorageGSettings *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
6 GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
7
8- if (!priv->gwd)
9+ if (!priv->mutter)
10 return FALSE;
11
12 return gwd_settings_writable_attach_modal_dialogs_changed (priv->writable,

Subscribers

People subscribed via source and target branches