rpms/dconf/devel dconf-multi-write.patch,NONE,1.1 dconf.spec,1.1,1.2

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/dconf/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8371

Modified Files:
	dconf.spec 
Added Files:
	dconf-multi-write.patch 
Log Message:
Make batched writes work


dconf-multi-write.patch:
 gsettings/dconfdatabase.c |    2 +-
 service/service.c         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dconf-multi-write.patch ---
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;


Index: dconf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dconf/devel/dconf.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dconf.spec	20 May 2010 20:54:48 -0000	1.1
+++ dconf.spec	21 May 2010 22:22:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           dconf
 Version:        0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A configuration system
 
 Group:          System Environment/Base
@@ -11,8 +11,10 @@ Source0:        http://download.gnome.or
 BuildRequires:  glib2-devel >= 2.25.6
 Requires:       dbus
 
-# fix a case of needle/haystack confusion
+# upstream fix for a case of needle/haystack confusion
 Patch0:         dconf-query.patch
+# upstream fix for batched writes
+Patch1:         dconf-multi-write.patch
 
 %description
 dconf is a low-level configuration system. Its main purpose is to provide a
@@ -21,6 +23,7 @@ backend to the GSettings API in GLib.
 %prep
 %setup -q
 %patch0 -p1 -b .query
+%patch1 -p1 -b .multi-write
 
 
 %build
@@ -51,6 +54,9 @@ gio-querymodules-%{__isa_bits} %{_libdir
 
 
 %changelog
+* Fri May 21 2010 Matthias Clasen <mclasen at redhat.com> 0.3-3
+- Make batched writes (e.g. with delayed settings) work
+
 * Thu May 20 2010 Matthias Clasen <mclasen at redhat.com> 0.3-2
 - Make the registration of the backend work