Merge lp:~compiz-team/compiz-compizconfig-gconf/compiz-compizconfig-gconf.fix_802373 into lp:compiz-compizconfig-gconf/trunk

Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 159
Proposed branch: lp:~compiz-team/compiz-compizconfig-gconf/compiz-compizconfig-gconf.fix_802373
Merge into: lp:compiz-compizconfig-gconf/trunk
Diff against target: 58 lines (+26/-1)
1 file modified
src/gconf.c (+26/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz-compizconfig-gconf/compiz-compizconfig-gconf.fix_802373
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Sam Spilsbury Pending
Review via email: mp+65940@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Neil J. Patel (njpatel) wrote :

Looks good, approved!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/gconf.c'
2--- src/gconf.c 2010-12-10 13:52:54 +0000
3+++ src/gconf.c 2011-06-27 07:24:33 +0000
4@@ -98,6 +98,7 @@
5 OptionInt,
6 OptionBool,
7 OptionKey,
8+ OptionBell,
9 OptionString,
10 OptionSpecial,
11 } SpecialOptionType;
12@@ -167,7 +168,7 @@
13 METACITY "/general/resize_with_right_button", OptionSpecial},
14
15 {"visual_bell", "fade", TRUE,
16- METACITY "/general/visual_bell", OptionBool},
17+ METACITY "/general/visual_bell", OptionBell},
18 {"fullscreen_visual_bell", "fade", TRUE,
19 METACITY "/general/visual_bell_type", OptionSpecial},
20
21@@ -1001,6 +1002,16 @@
22 ret = TRUE;
23 }
24 break;
25+ case OptionBell:
26+ if (gconfValue->type == GCONF_VALUE_BOOL)
27+ {
28+ gboolean value;
29+
30+ value = gconf_value_get_bool (gconfValue);
31+ ccsSetBell (setting, value ? TRUE : FALSE);
32+ ret = TRUE;
33+ }
34+ break;
35 case OptionString:
36 if (gconfValue->type == GCONF_VALUE_STRING)
37 {
38@@ -1518,6 +1529,20 @@
39 newValue, NULL);
40 }
41 break;
42+ case OptionBell:
43+ {
44+ Bool newValue;
45+ gboolean currentValue;
46+ if (!ccsGetBell (setting, &newValue))
47+ break;
48+ currentValue = gconf_client_get_bool (client, optionName, &err);
49+
50+ if (!err && ((currentValue && !newValue) ||
51+ (!currentValue && newValue)))
52+ gconf_client_set_bool (client, specialOptions[index].gnomeName,
53+ newValue, NULL);
54+ }
55+ break;
56 case OptionString:
57 {
58 char *newValue;

Subscribers

People subscribed via source and target branches