Compiz Configuration Library - GConf Backend

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

Proposed by Sam Spilsbury on 2011-10-15
Status: Superseded
Proposed branch: lp:~compiz-team/compiz-compizconfig-gconf/compiz-compizconfig-gconf.fix_874794
Merge into: lp:compiz-compizconfig-gconf
Diff against target: 173 lines (+19/-19) 1 file modified
To merge this branch: bzr merge lp:~compiz-team/compiz-compizconfig-gconf/compiz-compizconfig-gconf.fix_874794
Reviewer Review Type Date Requested Status
Compiz Maintainers 2011-10-15 Pending
Review via email: mp+79455@code.launchpad.net

Description of the Change

To post a comment you must log in.
Tim Penhey (thumper) wrote :

The bug and the code don't look like they relate to each other. The bug talks about reading, but the methods you have changed are setting values.

Sam Spilsbury (smspillaz) wrote :

Ah, this code writes changes directly to the structure, but changes the arguments so that they are not also written to disk.

See my comment on 874830 on a way to make that more clear.

163. By Sam Spilsbury on 2012-01-21

Use more descriptive names

Daniel van Vugt (vanvugt) wrote :

Ping compiz-team :)

Unmerged revisions

163. By Sam Spilsbury on 2012-01-21

Use more descriptive names

162. By Sam Spilsbury on 2011-10-15

Don't immediately update settings on read

161. By Sam Spilsbury on 2011-09-09

Merge

Preview Diff

1=== modified file 'src/gconf.c'
2--- src/gconf.c 2011-09-09 09:33:52 +0000
3+++ src/gconf.c 2012-01-21 21:20:28 +0000
4@@ -982,7 +982,7 @@
5 guint value;
6
7 value = gconf_value_get_int (gconfValue);
8- ccsSetInt (setting, value, TRUE);
9+ ccsSetInt (setting, value, SetTemporary);
10 ret = TRUE;
11 }
12 break;
13@@ -992,7 +992,7 @@
14 gboolean value;
15
16 value = gconf_value_get_bool (gconfValue);
17- ccsSetBool (setting, value ? TRUE : FALSE, TRUE);
18+ ccsSetBool (setting, value ? TRUE : FALSE, SetTemporary);
19 ret = TRUE;
20 }
21 break;
22@@ -1002,7 +1002,7 @@
23 gboolean value;
24
25 value = gconf_value_get_bool (gconfValue);
26- ccsSetBell (setting, value ? TRUE : FALSE, TRUE);
27+ ccsSetBell (setting, value ? TRUE : FALSE, SetTemporary);
28
29 ret = TRUE;
30 }
31@@ -1015,7 +1015,7 @@
32 value = gconf_value_get_string (gconfValue);
33 if (value)
34 {
35- ccsSetString (setting, value, TRUE);
36+ ccsSetString (setting, value, SetTemporary);
37 ret = TRUE;
38 }
39 }
40@@ -1034,7 +1034,7 @@
41 ccsGetKey (setting, &key);
42 if (ccsStringToKeyBinding (value, &key))
43 {
44- ccsSetKey (setting, key, TRUE);
45+ ccsSetKey (setting, key, SetTemporary);
46 ret = TRUE;
47 }
48 }
49@@ -1052,7 +1052,7 @@
50 gboolean showAll;
51
52 showAll = gconf_value_get_bool (gconfValue);
53- ccsSetBool (setting, !showAll, TRUE);
54+ ccsSetBool (setting, !showAll, SetTemporary);
55 ret = TRUE;
56 }
57 }
58@@ -1068,7 +1068,7 @@
59 Bool fullscreen;
60
61 fullscreen = strcmp (value, "fullscreen") == 0;
62- ccsSetBool (setting, fullscreen, TRUE);
63+ ccsSetBool (setting, fullscreen, SetTemporary);
64 ret = TRUE;
65 }
66 }
67@@ -1084,7 +1084,7 @@
68 if (focusMode)
69 {
70 Bool clickToFocus = (strcmp (focusMode, "click") == 0);
71- ccsSetBool (setting, clickToFocus, TRUE);
72+ ccsSetBool (setting, clickToFocus, SetTemporary);
73 ret = TRUE;
74 }
75 }
76@@ -1115,7 +1115,7 @@
77 else
78 button.button = 1;
79
80- ccsSetButton (setting, button, TRUE);
81+ ccsSetButton (setting, button, SetTemporary);
82 ret = TRUE;
83 }
84 }
85@@ -1195,7 +1195,7 @@
86 value = gconf_value_get_string (gconfValue);
87 if (value)
88 {
89- ccsSetString (setting, value, TRUE);
90+ ccsSetString (setting, value, SetTemporary);
91 ret = TRUE;
92 }
93 }
94@@ -1206,7 +1206,7 @@
95 value = gconf_value_get_string (gconfValue);
96 if (value)
97 {
98- ccsSetMatch (setting, value, TRUE);
99+ ccsSetMatch (setting, value, SetTemporary);
100 ret = TRUE;
101 }
102 }
103@@ -1225,7 +1225,7 @@
104 gboolean value;
105 value = gconf_value_get_bool (gconfValue);
106
107- ccsSetBool (setting, value ? TRUE : FALSE, TRUE);
108+ ccsSetBool (setting, value ? TRUE : FALSE, SetTemporary);
109 ret = TRUE;
110 }
111 break;
112@@ -1234,7 +1234,7 @@
113 double value;
114 value = gconf_value_get_float (gconfValue);
115
116- ccsSetFloat (setting, (float)value, TRUE);
117+ ccsSetFloat (setting, (float)value, SetTemporary);
118 ret = TRUE;
119 }
120 break;
121@@ -1246,7 +1246,7 @@
122
123 if (value && ccsStringToColor (value, &color))
124 {
125- ccsSetColor (setting, color, TRUE);
126+ ccsSetColor (setting, color, SetTemporary);
127 ret = TRUE;
128 }
129 }
130@@ -1259,7 +1259,7 @@
131
132 if (value && ccsStringToKeyBinding (value, &key))
133 {
134- ccsSetKey (setting, key, TRUE);
135+ ccsSetKey (setting, key, SetTemporary);
136 ret = TRUE;
137 }
138 }
139@@ -1272,7 +1272,7 @@
140
141 if (value && ccsStringToButtonBinding (value, &button))
142 {
143- ccsSetButton (setting, button, TRUE);
144+ ccsSetButton (setting, button, SetTemporary);
145 ret = TRUE;
146 }
147 }
148@@ -1286,7 +1286,7 @@
149 {
150 unsigned int edges;
151 edges = ccsStringToEdges (value);
152- ccsSetEdge (setting, edges, TRUE);
153+ ccsSetEdge (setting, edges, SetTemporary);
154 ret = TRUE;
155 }
156 }
157@@ -1296,7 +1296,7 @@
158 gboolean value;
159 value = gconf_value_get_bool (gconfValue);
160
161- ccsSetBell (setting, value ? TRUE : FALSE, TRUE);
162+ ccsSetBell (setting, value ? TRUE : FALSE, SetTemporary);
163 ret = TRUE;
164 }
165 break;
166@@ -1484,7 +1484,7 @@
167 value.button = button;
168 value.buttonModMask = buttonModMask;
169
170- ccsSetButton (s, value, TRUE);
171+ ccsSetButton (s, value, SetTemporary);
172 }
173 }
174

Subscribers

People subscribed via source and target branches

to all changes: