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
src/gconf.c (+19/-19)
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

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/gconf.c'
--- src/gconf.c 2011-09-09 09:33:52 +0000
+++ src/gconf.c 2012-01-21 21:20:28 +0000
@@ -982,7 +982,7 @@
982 guint value;982 guint value;
983983
984 value = gconf_value_get_int (gconfValue);984 value = gconf_value_get_int (gconfValue);
985 ccsSetInt (setting, value, TRUE);985 ccsSetInt (setting, value, SetTemporary);
986 ret = TRUE;986 ret = TRUE;
987 }987 }
988 break;988 break;
@@ -992,7 +992,7 @@
992 gboolean value;992 gboolean value;
993993
994 value = gconf_value_get_bool (gconfValue);994 value = gconf_value_get_bool (gconfValue);
995 ccsSetBool (setting, value ? TRUE : FALSE, TRUE);995 ccsSetBool (setting, value ? TRUE : FALSE, SetTemporary);
996 ret = TRUE;996 ret = TRUE;
997 }997 }
998 break;998 break;
@@ -1002,7 +1002,7 @@
1002 gboolean value;1002 gboolean value;
10031003
1004 value = gconf_value_get_bool (gconfValue);1004 value = gconf_value_get_bool (gconfValue);
1005 ccsSetBell (setting, value ? TRUE : FALSE, TRUE);1005 ccsSetBell (setting, value ? TRUE : FALSE, SetTemporary);
10061006
1007 ret = TRUE;1007 ret = TRUE;
1008 }1008 }
@@ -1015,7 +1015,7 @@
1015 value = gconf_value_get_string (gconfValue);1015 value = gconf_value_get_string (gconfValue);
1016 if (value)1016 if (value)
1017 {1017 {
1018 ccsSetString (setting, value, TRUE);1018 ccsSetString (setting, value, SetTemporary);
1019 ret = TRUE;1019 ret = TRUE;
1020 }1020 }
1021 }1021 }
@@ -1034,7 +1034,7 @@
1034 ccsGetKey (setting, &key);1034 ccsGetKey (setting, &key);
1035 if (ccsStringToKeyBinding (value, &key))1035 if (ccsStringToKeyBinding (value, &key))
1036 {1036 {
1037 ccsSetKey (setting, key, TRUE);1037 ccsSetKey (setting, key, SetTemporary);
1038 ret = TRUE;1038 ret = TRUE;
1039 }1039 }
1040 }1040 }
@@ -1052,7 +1052,7 @@
1052 gboolean showAll;1052 gboolean showAll;
10531053
1054 showAll = gconf_value_get_bool (gconfValue);1054 showAll = gconf_value_get_bool (gconfValue);
1055 ccsSetBool (setting, !showAll, TRUE);1055 ccsSetBool (setting, !showAll, SetTemporary);
1056 ret = TRUE;1056 ret = TRUE;
1057 }1057 }
1058 }1058 }
@@ -1068,7 +1068,7 @@
1068 Bool fullscreen;1068 Bool fullscreen;
10691069
1070 fullscreen = strcmp (value, "fullscreen") == 0;1070 fullscreen = strcmp (value, "fullscreen") == 0;
1071 ccsSetBool (setting, fullscreen, TRUE);1071 ccsSetBool (setting, fullscreen, SetTemporary);
1072 ret = TRUE;1072 ret = TRUE;
1073 }1073 }
1074 }1074 }
@@ -1084,7 +1084,7 @@
1084 if (focusMode)1084 if (focusMode)
1085 {1085 {
1086 Bool clickToFocus = (strcmp (focusMode, "click") == 0);1086 Bool clickToFocus = (strcmp (focusMode, "click") == 0);
1087 ccsSetBool (setting, clickToFocus, TRUE);1087 ccsSetBool (setting, clickToFocus, SetTemporary);
1088 ret = TRUE;1088 ret = TRUE;
1089 }1089 }
1090 }1090 }
@@ -1115,7 +1115,7 @@
1115 else1115 else
1116 button.button = 1;1116 button.button = 1;
11171117
1118 ccsSetButton (setting, button, TRUE);1118 ccsSetButton (setting, button, SetTemporary);
1119 ret = TRUE;1119 ret = TRUE;
1120 }1120 }
1121 }1121 }
@@ -1195,7 +1195,7 @@
1195 value = gconf_value_get_string (gconfValue);1195 value = gconf_value_get_string (gconfValue);
1196 if (value)1196 if (value)
1197 {1197 {
1198 ccsSetString (setting, value, TRUE);1198 ccsSetString (setting, value, SetTemporary);
1199 ret = TRUE;1199 ret = TRUE;
1200 }1200 }
1201 }1201 }
@@ -1206,7 +1206,7 @@
1206 value = gconf_value_get_string (gconfValue);1206 value = gconf_value_get_string (gconfValue);
1207 if (value)1207 if (value)
1208 {1208 {
1209 ccsSetMatch (setting, value, TRUE);1209 ccsSetMatch (setting, value, SetTemporary);
1210 ret = TRUE;1210 ret = TRUE;
1211 }1211 }
1212 }1212 }
@@ -1225,7 +1225,7 @@
1225 gboolean value;1225 gboolean value;
1226 value = gconf_value_get_bool (gconfValue);1226 value = gconf_value_get_bool (gconfValue);
12271227
1228 ccsSetBool (setting, value ? TRUE : FALSE, TRUE);1228 ccsSetBool (setting, value ? TRUE : FALSE, SetTemporary);
1229 ret = TRUE;1229 ret = TRUE;
1230 }1230 }
1231 break;1231 break;
@@ -1234,7 +1234,7 @@
1234 double value;1234 double value;
1235 value = gconf_value_get_float (gconfValue);1235 value = gconf_value_get_float (gconfValue);
12361236
1237 ccsSetFloat (setting, (float)value, TRUE);1237 ccsSetFloat (setting, (float)value, SetTemporary);
1238 ret = TRUE;1238 ret = TRUE;
1239 }1239 }
1240 break;1240 break;
@@ -1246,7 +1246,7 @@
12461246
1247 if (value && ccsStringToColor (value, &color))1247 if (value && ccsStringToColor (value, &color))
1248 {1248 {
1249 ccsSetColor (setting, color, TRUE);1249 ccsSetColor (setting, color, SetTemporary);
1250 ret = TRUE;1250 ret = TRUE;
1251 }1251 }
1252 }1252 }
@@ -1259,7 +1259,7 @@
12591259
1260 if (value && ccsStringToKeyBinding (value, &key))1260 if (value && ccsStringToKeyBinding (value, &key))
1261 {1261 {
1262 ccsSetKey (setting, key, TRUE);1262 ccsSetKey (setting, key, SetTemporary);
1263 ret = TRUE;1263 ret = TRUE;
1264 }1264 }
1265 }1265 }
@@ -1272,7 +1272,7 @@
12721272
1273 if (value && ccsStringToButtonBinding (value, &button))1273 if (value && ccsStringToButtonBinding (value, &button))
1274 {1274 {
1275 ccsSetButton (setting, button, TRUE);1275 ccsSetButton (setting, button, SetTemporary);
1276 ret = TRUE;1276 ret = TRUE;
1277 }1277 }
1278 }1278 }
@@ -1286,7 +1286,7 @@
1286 {1286 {
1287 unsigned int edges;1287 unsigned int edges;
1288 edges = ccsStringToEdges (value);1288 edges = ccsStringToEdges (value);
1289 ccsSetEdge (setting, edges, TRUE);1289 ccsSetEdge (setting, edges, SetTemporary);
1290 ret = TRUE;1290 ret = TRUE;
1291 }1291 }
1292 }1292 }
@@ -1296,7 +1296,7 @@
1296 gboolean value;1296 gboolean value;
1297 value = gconf_value_get_bool (gconfValue);1297 value = gconf_value_get_bool (gconfValue);
12981298
1299 ccsSetBell (setting, value ? TRUE : FALSE, TRUE);1299 ccsSetBell (setting, value ? TRUE : FALSE, SetTemporary);
1300 ret = TRUE;1300 ret = TRUE;
1301 }1301 }
1302 break;1302 break;
@@ -1484,7 +1484,7 @@
1484 value.button = button;1484 value.button = button;
1485 value.buttonModMask = buttonModMask;1485 value.buttonModMask = buttonModMask;
14861486
1487 ccsSetButton (s, value, TRUE);1487 ccsSetButton (s, value, SetTemporary);
1488 }1488 }
1489}1489}
14901490

Subscribers

People subscribed via source and target branches

to all changes: