rpms/GConf2/devel gconf-unset-mandatory.patch, NONE, 1.1 GConf2.spec, 1.80, 1.81

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/GConf2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21926

Modified Files:
	GConf2.spec 
Added Files:
	gconf-unset-mandatory.patch 
Log Message:
Apply some patches


gconf-unset-mandatory.patch:

--- NEW FILE gconf-unset-mandatory.patch ---
Index: gconf/gconf-database.c
===================================================================
--- gconf/gconf-database.c	(revision 2583)
+++ gconf/gconf-database.c	(working copy)
@@ -1261,11 +1261,10 @@ gconf_database_notify_listeners (GConfDa
 
   g_slist_free (closure.dead);
 
-  if (notify_others)
+  if (modified_sources)
     {
-      g_return_if_fail (modified_sources != NULL);
-
-      gconfd_notify_other_listeners (db, modified_sources, key);
+      if (notify_others)
+          gconfd_notify_other_listeners (db, modified_sources, key);
 
       g_list_free (modified_sources->sources);
       g_free (modified_sources);


Index: GConf2.spec
===================================================================
RCS file: /cvs/extras/rpms/GConf2/devel/GConf2.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- GConf2.spec	4 May 2008 21:18:54 -0000	1.80
+++ GConf2.spec	4 May 2008 21:42:16 -0000	1.81
@@ -38,6 +38,8 @@
 Patch3: gconf-defaults.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=126468
 Patch4: gconf-no-syslog.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=525504
+Patch5: gconf-unset-mandatory.patch
 
 %description
 GConf is a process-transparent configuration database API used to 
@@ -77,6 +79,7 @@
 %patch2 -p1 -b .timeouts
 %patch3 -p1 -b .defaults
 %patch4 -p1 -b .no-syslog
+%patch5 -p0 -b .unset-mandatory
 
 %build
 rm -f libtool
@@ -148,6 +151,11 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun May 4 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-4
+- Apply some patches: 
+  - Don't spam syslog
+  - Handle unsetting mandatory keys without critical warnings 
+
 * Fri May 2 2008 Matthias Clasen <mclasen at redhat.com> - 2.22.0-3
 - Add a dbus service to set defaults