Make gconfd notice defaults changes

GConf2.spec

@@ -7,7 +7,7 @@
 Summary: A process-transparent configuration system
 Name: GConf2
 Version: 2.22.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Source: http://download.gnome.org/sources/GConf/2.22/GConf-%{version}.tar.bz2
@@ -39,14 +39,16 @@ Patch0: GConf-2.18.0.1-reload.patch
 Patch1: GConf2-2.14.0-timeout.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=531063
 Patch2: gconf-timeouts.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=531169
-Patch3: gconf-defaults.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=126468
-Patch4: gconf-no-syslog.patch
+Patch3: gconf-no-syslog.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=525504
-Patch5: gconf-unset-mandatory.patch
+Patch4: gconf-unset-mandatory.patch
+
+Patch5: gconf-2.22.0-use-dbus.patch
 
-Patch6: gconf-2.22.0-use-dbus.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=531169
+Patch6: defaults.patch
+Patch7: fix-defaults.patch
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -84,10 +86,11 @@ which require GTK+.
 %patch0 -p1 -b .reload
 %patch1 -p1 -b .timers  
 %patch2 -p1 -b .timeouts
-%patch3 -p1 -b .defaults
+%patch3 -p1 -b .no-syslog
-%patch4 -p1 -b .no-syslog
+%patch4 -p0 -b .unset-mandatory
-%patch5 -p0 -b .unset-mandatory
+%patch5 -p1 -b .use-dbus
-%patch6 -p1 -b .use-dbus
+%patch6 -p1 -b .defaults
+%patch7 -p1 -b .fix-defaults
 
 %build
 rm -f libtool
@@ -160,6 +163,9 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Jun  2 2008 Matthias Clasen  <mclasen@redhat.com> - 2.22.0-10
+- Make gconfd notice defaults changes
+
 * Wed May 21 2008 Ray Strode <rstrode@redhat.com> - 2.22.0-9
 - Don't ever try to autolaunch a bus if DISPLAY is unset
 

fix-defaults.patch

@@ -0,0 +1,21 @@
+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);