From 72c4980d7ada9a4ba9603e0b5b0a43f5d0293c3a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: May 05 2008 05:18:26 +0000
Subject: fix background drawing without nautilus


---

diff --git a/gnome-settings-daemon-background-without-nautilus.patch b/gnome-settings-daemon-background-without-nautilus.patch
new file mode 100644
index 0000000..e529345
--- /dev/null
+++ b/gnome-settings-daemon-background-without-nautilus.patch
@@ -0,0 +1,21 @@
+diff -up gnome-settings-daemon-2.22.1/plugins/background/gsd-background-manager.c.no-nautilus gnome-settings-daemon-2.22.1/plugins/background/gsd-background-manager.c
+--- gnome-settings-daemon-2.22.1/plugins/background/gsd-background-manager.c.no-nautilus	2008-03-24 17:42:47.000000000 -0400
++++ gnome-settings-daemon-2.22.1/plugins/background/gsd-background-manager.c	2008-05-05 01:08:37.000000000 -0400
+@@ -292,6 +294,7 @@ gsd_background_manager_start (GsdBackgro
+         bg_preferences_load (manager->priv->prefs);
+ 
+         client = gconf_client_get_default ();
++	gconf_client_add_dir (client, "/desktop/gnome/background", GCONF_CLIENT_PRELOAD_NONE, NULL);
+         gconf_client_notify_add (client,
+                                  "/desktop/gnome/background",
+                                  (GConfClientNotifyFunc) background_callback,
+@@ -314,6 +317,9 @@ gsd_background_manager_start (GsdBackgro
+         if (!nautilus_show_desktop) {
+                 apply_prefs (manager);
+         }
++	else {
++		g_timeout_add_seconds (5, apply_prefs, manager);
++	}
+ 
+         gnome_settings_profile_end (NULL);
+ 
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 6c3358c..424dc4b 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.22.1
-Release:	1.2008.03.26.7%{?dist}
+Release:	1.2008.03.26.8%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -37,6 +37,8 @@ Patch4:         gnome-settings-daemon-2.22.1-hide-white-screen.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=530356
 # https://bugzilla.redhat.com/show_bug.cgi?id=346201
 Patch5:         gsd-handle-different-keysyms.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=531487
+Patch6:		gnome-settings-daemon-background-without-nautilus.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -63,10 +65,11 @@ pushd plugins/mouse/
 popd
 %patch4 -p1 -b .hide-white-screen
 %patch5 -p0 -b .multi-keysyms
+%patch6 -p1 -b .background-without-nautilus
 
 %build
 %configure --enable-static=no --enable-profiling
-make %{?_smp_mflags}
+make CFLAGS="-O0 -g" #%{?_smp_mflags}
 
 cd po
 # clean up .po files
@@ -144,6 +147,9 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon May  5 2008 Matthias Clasen <mclasen@redhat.com> - 2.22.1-1.2008.03.26.8
+- Fix background drawing without nautilus
+
 * Tue Apr 29 2008 - Bastien Nocera <bnocera@redhat.com> - 2.22.1-1.2008.03.26.7
 - Add patch from upstream to avoid the Stop button triggering an Eject (#346201)