Compiz Configuration Library - GSettings Backend

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

  1. compiz-compizconfig-gsettings.fix_874815
  2. Merge into trunk
Proposed by Sam Spilsbury
Status: Work in progress
Proposed branch: lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815
Merge into: lp:compiz-compizconfig-gsettings
Prerequisite: lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_872976
Diff against target: 160 lines (+17/-17)
2 files modified
src/gconf-integration.c (+7/-7)
src/gsettings.c (+10/-10)
To merge this branch: bzr merge lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815
Reviewer Review Type Date Requested Status
Sam Spilsbury Pending
Review via email: mp+80517@code.launchpad.net

This proposal supersedes a proposal from 2011-10-15.

Description of the change

Bug 874815

To post a comment you must log in.
lp:~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815 updated
160. By Sam Spilsbury

Merge in changes from truncation branch

161. By Sam Spilsbury

More descriptive names

Unmerged revisions

161. By Sam Spilsbury

More descriptive names

160. By Sam Spilsbury

Merge in changes from truncation branch

159. By Sam Spilsbury

Fix conflicts

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:28:26 +0000
3+++ src/gconf-integration.c 2012-01-21 21:23:24 +0000
4@@ -577,7 +577,7 @@
5 gboolean value;
6
7 value = gconf_value_get_bool (gconfValue);
8- ccsSetBool (setting, value ? TRUE : FALSE, TRUE);
9+ ccsSetBool (setting, value ? TRUE : FALSE, FALSE);
10 ret = TRUE;
11 }
12 break;
13@@ -589,7 +589,7 @@
14 value = gconf_value_get_string (gconfValue);
15 if (value)
16 {
17- ccsSetString (setting, value, TRUE);
18+ ccsSetString (setting, value, FALSE);
19 ret = TRUE;
20 }
21 }
22@@ -626,7 +626,7 @@
23 gboolean showAll;
24
25 showAll = gconf_value_get_bool (gconfValue);
26- ccsSetBool (setting, !showAll, TRUE);
27+ ccsSetBool (setting, !showAll, FALSE);
28 ret = TRUE;
29 }
30 }
31@@ -642,7 +642,7 @@
32 Bool fullscreen;
33
34 fullscreen = strcmp (value, "fullscreen") == 0;
35- ccsSetBool (setting, fullscreen, TRUE);
36+ ccsSetBool (setting, fullscreen, FALSE);
37 ret = TRUE;
38 }
39 }
40@@ -658,7 +658,7 @@
41 if (focusMode)
42 {
43 Bool clickToFocus = (strcmp (focusMode, "click") == 0);
44- ccsSetBool (setting, clickToFocus, TRUE);
45+ ccsSetBool (setting, clickToFocus, FALSE);
46 ret = TRUE;
47 }
48 }
49@@ -689,7 +689,7 @@
50 else
51 button.button = 1;
52
53- ccsSetButton (setting, button, TRUE);
54+ ccsSetButton (setting, button, FALSE);
55 ret = TRUE;
56 }
57 }
58@@ -760,7 +760,7 @@
59 value.button = button;
60 value.buttonModMask = buttonModMask;
61
62- ccsSetButton (s, value, TRUE);
63+ ccsSetButton (s, value, FALSE);
64 }
65 }
66
67
68=== modified file 'src/gsettings.c'
69--- src/gsettings.c 2012-01-21 21:23:24 +0000
70+++ src/gsettings.c 2012-01-21 21:23:24 +0000
71@@ -557,7 +557,7 @@
72 value = g_variant_get_string (gsettingsValue, NULL);
73 if (value)
74 {
75- ccsSetString (setting, value, TRUE);
76+ ccsSetString (setting, value, SetTemporary);
77 ret = TRUE;
78 }
79 }
80@@ -568,7 +568,7 @@
81 value = g_variant_get_string (gsettingsValue, NULL);
82 if (value)
83 {
84- ccsSetMatch (setting, value, TRUE);
85+ ccsSetMatch (setting, value, SetTemporary);
86 ret = TRUE;
87 }
88 }
89@@ -578,7 +578,7 @@
90 int value;
91 value = g_variant_get_int32 (gsettingsValue);
92
93- ccsSetInt (setting, value, TRUE);
94+ ccsSetInt (setting, value, SetTemporary);
95 ret = TRUE;
96 }
97 break;
98@@ -587,7 +587,7 @@
99 gboolean value;
100 value = g_variant_get_boolean (gsettingsValue);
101
102- ccsSetBool (setting, value ? TRUE : FALSE, TRUE);
103+ ccsSetBool (setting, value ? TRUE : FALSE, SetTemporary);
104 ret = TRUE;
105 }
106 break;
107@@ -596,7 +596,7 @@
108 double value;
109 value = g_variant_get_double (gsettingsValue);
110
111- ccsSetFloat (setting, (float)value, TRUE);
112+ ccsSetFloat (setting, (float)value, SetTemporary);
113 ret = TRUE;
114 }
115 break;
116@@ -608,7 +608,7 @@
117
118 if (value && ccsStringToColor (value, &color))
119 {
120- ccsSetColor (setting, color, TRUE);
121+ ccsSetColor (setting, color, SetTemporary);
122 ret = TRUE;
123 }
124 }
125@@ -621,7 +621,7 @@
126
127 if (value && ccsStringToKeyBinding (value, &key))
128 {
129- ccsSetKey (setting, key, TRUE);
130+ ccsSetKey (setting, key, SetTemporary);
131 ret = TRUE;
132 }
133 }
134@@ -634,7 +634,7 @@
135
136 if (value && ccsStringToButtonBinding (value, &button))
137 {
138- ccsSetButton (setting, button, TRUE);
139+ ccsSetButton (setting, button, SetTemporary);
140 ret = TRUE;
141 }
142 }
143@@ -648,7 +648,7 @@
144 {
145 unsigned int edges;
146 edges = ccsStringToEdges (value);
147- ccsSetEdge (setting, edges, TRUE);
148+ ccsSetEdge (setting, edges, SetTemporary);
149 ret = TRUE;
150 }
151 }
152@@ -658,7 +658,7 @@
153 gboolean value;
154 value = g_variant_get_boolean (gsettingsValue);
155
156- ccsSetBell (setting, value ? TRUE : FALSE, TRUE);
157+ ccsSetBell (setting, value ? TRUE : FALSE, SetTemporary);
158 ret = TRUE;
159 }
160 break;

Subscribers

People subscribed via source and target branches