You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
22 lines
938 B
22 lines
938 B
17 years ago
|
diff -up GConf-2.22.0/defaults/gconf-defaults.c.fix-defaults GConf-2.22.0/defaults/gconf-defaults.c
|
||
|
|
--- GConf-2.22.0/defaults/gconf-defaults.c.fix-defaults 2008-06-03 02:04:06.000000000 -0400
|
||
|
|
+++ GConf-2.22.0/defaults/gconf-defaults.c 2008-06-03 02:04:29.000000000 -0400
|
||
|
|
@@ -549,7 +549,7 @@ do_copy (GConfDefaults *mechani
|
||
|
|
copy_entry (source, includes[i], changes, excludes);
|
||
|
|
}
|
||
|
|
|
||
|
|
- gconf_client_commit_change_set (dest, changes, TRUE, &error);
|
||
|
|
+ gconf_client_commit_change_set (dest, changes, FALSE, &error);
|
||
|
|
gconf_client_suggest_sync (dest, NULL);
|
||
|
|
|
||
|
|
if (changeset_out) {
|
||
|
|
@@ -612,7 +612,7 @@ gconf_defaults_set_system (GConfDefaults
|
||
|
|
gconf_change_set_foreach (changes, append_key, keys);
|
||
|
|
g_ptr_array_add (keys, NULL);
|
||
|
|
|
||
|
|
- g_signal_emit (mechanism, signals[SYSTEM_SET], 0, keys);
|
||
|
|
+ g_signal_emit (mechanism, signals[SYSTEM_SET], 0, keys->pdata);
|
||
|
|
|
||
|
|
g_ptr_array_free (keys, TRUE);
|
||
|
|
gconf_change_set_unref (changes);
|