Compiz Configuration Library - GSettings Backend

Merge lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.settings_upgrade into lp:compiz-compizconfig-gsettings

  1. compiz-compizconfig-gsettings.settings_upgrade
  2. Merge into trunk
Proposed by Sam Spilsbury
Status: Merged
Merged at revision: 158
Proposed branch: lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.settings_upgrade
Merge into: lp:compiz-compizconfig-gsettings
Prerequisite: lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.port_to_gsettings
Diff against target: 228 lines (+30/-24)
2 files modified
src/gconf-integration.c (+9/-9)
src/gsettings.c (+21/-15)
To merge this branch: bzr merge lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.settings_upgrade
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Review via email: mp+68994@code.launchpad.net

Description of the change

API Update

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

On Mon, 25 Jul 2011 02:47:37 you wrote:
> - ret = ccsStringListAppend (ret, strdup (profile));
> + {
> + CCSString *str = malloc (sizeof (CCSString));
> +
> + str->value = strdup (profile);
> +
> + ret = ccsStringListAppend (ret, str);
> + }

Does ccsStringListAppend take ownership of the "str" memory?

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Yes
On Jul 24, 2011 10:47 PM, "Sam Spilsbury" <email address hidden> wrote:
> Sam Spilsbury has proposed merging
 lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.settings_upgrade
into lp:compiz-compizconfig-gsettings with
lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.port_to_gsettings
as a prerequisite.
>
> Requested reviews:
> Jason Smith (jassmith)
>
> For more details, see:
>
 https://code.launchpad.net/~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.settings_upgrade/+merge/68994
>
> API Update
> --
>
 https://code.launchpad.net/~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.settings_upgrade/+merge/68994
> You proposed
 lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.settings_upgrade
for merging.

Revision history for this message
Jason Smith (jassmith) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/gconf-integration.c'
2--- src/gconf-integration.c 2011-07-24 14:47:23 +0000
3+++ src/gconf-integration.c 2011-07-24 14:47:23 +0000
4@@ -567,7 +567,7 @@
5 guint value;
6
7 value = gconf_value_get_int (gconfValue);
8- ccsSetInt (setting, value);
9+ ccsSetInt (setting, value, TRUE);
10 ret = TRUE;
11 }
12 break;
13@@ -577,7 +577,7 @@
14 gboolean value;
15
16 value = gconf_value_get_bool (gconfValue);
17- ccsSetBool (setting, value ? TRUE : FALSE);
18+ ccsSetBool (setting, value ? TRUE : FALSE, TRUE);
19 ret = TRUE;
20 }
21 break;
22@@ -589,7 +589,7 @@
23 value = gconf_value_get_string (gconfValue);
24 if (value)
25 {
26- ccsSetString (setting, value);
27+ ccsSetString (setting, value, TRUE);
28 ret = TRUE;
29 }
30 }
31@@ -608,7 +608,7 @@
32 ccsGetKey (setting, &key);
33 if (ccsStringToKeyBinding (value, &key))
34 {
35- ccsSetKey (setting, key);
36+ ccsSetKey (setting, key, TRUE);
37 ret = TRUE;
38 }
39 }
40@@ -626,7 +626,7 @@
41 gboolean showAll;
42
43 showAll = gconf_value_get_bool (gconfValue);
44- ccsSetBool (setting, !showAll);
45+ ccsSetBool (setting, !showAll, TRUE);
46 ret = TRUE;
47 }
48 }
49@@ -642,7 +642,7 @@
50 Bool fullscreen;
51
52 fullscreen = strcmp (value, "fullscreen") == 0;
53- ccsSetBool (setting, fullscreen);
54+ ccsSetBool (setting, fullscreen, TRUE);
55 ret = TRUE;
56 }
57 }
58@@ -658,7 +658,7 @@
59 if (focusMode)
60 {
61 Bool clickToFocus = (strcmp (focusMode, "click") == 0);
62- ccsSetBool (setting, clickToFocus);
63+ ccsSetBool (setting, clickToFocus, TRUE);
64 ret = TRUE;
65 }
66 }
67@@ -689,7 +689,7 @@
68 else
69 button.button = 1;
70
71- ccsSetButton (setting, button);
72+ ccsSetButton (setting, button, TRUE);
73 ret = TRUE;
74 }
75 }
76@@ -760,7 +760,7 @@
77 value.button = button;
78 value.buttonModMask = buttonModMask;
79
80- ccsSetButton (s, value);
81+ ccsSetButton (s, value, TRUE);
82 }
83 }
84
85
86=== modified file 'src/gsettings.c'
87--- src/gsettings.c 2011-07-24 14:47:23 +0000
88+++ src/gsettings.c 2011-07-24 14:47:23 +0000
89@@ -273,7 +273,7 @@
90 readInit (context);
91 if (!readOption (setting))
92 {
93- ccsResetToDefault (setting);
94+ ccsResetToDefault (setting, TRUE);
95 }
96
97 if (ccsGetIntegrationEnabled (context) &&
98@@ -325,7 +325,7 @@
99 value = g_settings_get_value (settings, cleanSettingName);
100 if (!value)
101 {
102- ccsSetList (setting, NULL);
103+ ccsSetList (setting, NULL, TRUE);
104 return TRUE;
105 }
106
107@@ -435,7 +435,7 @@
108
109 if (list)
110 {
111- ccsSetList (setting, list);
112+ ccsSetList (setting, list, TRUE);
113 ccsSettingValueListFree (list, TRUE);
114 return TRUE;
115 }
116@@ -527,7 +527,7 @@
117 value = g_variant_get_string (gsettingsValue, NULL);
118 if (value)
119 {
120- ccsSetString (setting, value);
121+ ccsSetString (setting, value, TRUE);
122 ret = TRUE;
123 }
124 }
125@@ -538,7 +538,7 @@
126 value = g_variant_get_string (gsettingsValue, NULL);
127 if (value)
128 {
129- ccsSetMatch (setting, value);
130+ ccsSetMatch (setting, value, TRUE);
131 ret = TRUE;
132 }
133 }
134@@ -548,7 +548,7 @@
135 int value;
136 value = g_variant_get_int32 (gsettingsValue);
137
138- ccsSetInt (setting, value);
139+ ccsSetInt (setting, value, TRUE);
140 ret = TRUE;
141 }
142 break;
143@@ -557,7 +557,7 @@
144 gboolean value;
145 value = g_variant_get_boolean (gsettingsValue);
146
147- ccsSetBool (setting, value ? TRUE : FALSE);
148+ ccsSetBool (setting, value ? TRUE : FALSE, TRUE);
149 ret = TRUE;
150 }
151 break;
152@@ -566,7 +566,7 @@
153 double value;
154 value = g_variant_get_double (gsettingsValue);
155
156- ccsSetFloat (setting, (float)value);
157+ ccsSetFloat (setting, (float)value, TRUE);
158 ret = TRUE;
159 }
160 break;
161@@ -578,7 +578,7 @@
162
163 if (value && ccsStringToColor (value, &color))
164 {
165- ccsSetColor (setting, color);
166+ ccsSetColor (setting, color, TRUE);
167 ret = TRUE;
168 }
169 }
170@@ -591,7 +591,7 @@
171
172 if (value && ccsStringToKeyBinding (value, &key))
173 {
174- ccsSetKey (setting, key);
175+ ccsSetKey (setting, key, TRUE);
176 ret = TRUE;
177 }
178 }
179@@ -604,7 +604,7 @@
180
181 if (value && ccsStringToButtonBinding (value, &button))
182 {
183- ccsSetButton (setting, button);
184+ ccsSetButton (setting, button, TRUE);
185 ret = TRUE;
186 }
187 }
188@@ -618,7 +618,7 @@
189 {
190 unsigned int edges;
191 edges = ccsStringToEdges (value);
192- ccsSetEdge (setting, edges);
193+ ccsSetEdge (setting, edges, TRUE);
194 ret = TRUE;
195 }
196 }
197@@ -628,7 +628,7 @@
198 gboolean value;
199 value = g_variant_get_boolean (gsettingsValue);
200
201- ccsSetBell (setting, value ? TRUE : FALSE);
202+ ccsSetBell (setting, value ? TRUE : FALSE, TRUE);
203 ret = TRUE;
204 }
205 break;
206@@ -1088,7 +1088,7 @@
207 status = readOption (setting);
208
209 if (!status)
210- ccsResetToDefault (setting);
211+ ccsResetToDefault (setting, TRUE);
212 }
213
214 Bool
215@@ -1147,7 +1147,13 @@
216 value = g_settings_get_value (compizconfigSettings, "existing-profiles");
217 g_variant_iter_init (&iter, value);
218 while (g_variant_iter_loop (&iter, "s", &profile))
219- ret = ccsStringListAppend (ret, strdup (profile));
220+ {
221+ CCSString *str = malloc (sizeof (CCSString));
222+
223+ str->value = strdup (profile);
224+
225+ ret = ccsStringListAppend (ret, str);
226+ }
227
228 g_variant_unref (value);
229

Subscribers

People subscribed via source and target branches