From bc0999675f149e5a7cba70f0af090614e540bae7 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Sun, 4 May 2008 21:42:16 +0000
Subject: [PATCH] Apply some patches

---
 GConf2.spec                 |  8 ++++++++
 gconf-unset-mandatory.patch | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 gconf-unset-mandatory.patch

diff --git a/GConf2.spec b/GConf2.spec
index b1db0e1..957b231 100644
--- a/GConf2.spec
+++ b/GConf2.spec
@@ -38,6 +38,8 @@ Patch2: gconf-timeouts.patch
 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 @@ which require GTK+.
 %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 @@ fi
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Sun May 4 2008 Matthias Clasen <mclasen@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@redhat.com> - 2.22.0-3
 - Add a dbus service to set defaults
 
diff --git a/gconf-unset-mandatory.patch b/gconf-unset-mandatory.patch
new file mode 100644
index 0000000..e6009d7
--- /dev/null
+++ b/gconf-unset-mandatory.patch
@@ -0,0 +1,19 @@
+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);