25 lines
1.2 KiB
Diff
25 lines
1.2 KiB
Diff
|
diff -up dconf-0.3/gsettings/dconfdatabase.c.multi-write dconf-0.3/gsettings/dconfdatabase.c
|
||
|
|
--- dconf-0.3/gsettings/dconfdatabase.c.multi-write 2010-05-21 18:06:25.447432741 -0400
|
||
|
|
+++ dconf-0.3/gsettings/dconfdatabase.c 2010-05-21 18:06:39.905682921 -0400
|
||
|
|
@@ -364,7 +364,7 @@ dconf_database_write_tree (DConfDatabase
|
||
|
|
|
||
|
|
message =
|
||
|
|
g_dbus_message_new_method_call ("ca.desrt.dconf", "/",
|
||
|
|
- "ca.desrt.dconf.Writer", "Write");
|
||
|
|
+ "ca.desrt.dconf.Writer", "Merge");
|
||
|
|
|
||
|
|
g_variant_builder_init (&args, G_VARIANT_TYPE ("(sa(sav))"));
|
||
|
|
g_variant_builder_add (&args, "s", path);
|
||
|
|
diff -up dconf-0.3/service/service.c.multi-write dconf-0.3/service/service.c
|
||
|
|
--- dconf-0.3/service/service.c.multi-write 2010-05-19 10:42:03.000000000 -0400
|
||
|
|
+++ dconf-0.3/service/service.c 2010-05-21 17:52:04.416434906 -0400
|
||
|
|
@@ -204,7 +204,7 @@ method_call (GDBusConnection *conn
|
||
|
|
serial, key, none),
|
||
|
|
NULL);
|
||
|
|
}
|
||
|
|
- else if (strcmp (method_name, "Merge"))
|
||
|
|
+ else if (strcmp (method_name, "Merge") == 0)
|
||
|
|
{
|
||
|
|
GError *error = NULL;
|
||
|
|
const gchar *prefix;
|