gnome-settings-daemon r332 - in branches/gnome-2-22: . plugins/background

[jensg svn gnome org]

Author: jensg
Date: Mon May  5 18:14:41 2008
New Revision: 332
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=332&view=rev

Log:
2008-05-02  Jens Granseuer  <jensgr gmx net>

	Patch by: Matthias Clasen <mclasen redhat com>

	* plugins/background/gsd-background-manager.c:
	(gsd_background_manager_start): fix the background change notification
	and eventually apply the settings even if nautilus is supposed to be
	handling the background to make people running without nautilus happy
	(bug #531487)


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/plugins/background/gsd-background-manager.c

Modified: branches/gnome-2-22/plugins/background/gsd-background-manager.c
==============================================================================
--- branches/gnome-2-22/plugins/background/gsd-background-manager.c	(original)
+++ branches/gnome-2-22/plugins/background/gsd-background-manager.c	Mon May  5 18:14:41 2008
@@ -292,6 +292,8 @@
         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,
@@ -313,6 +315,8 @@
 
         if (!nautilus_show_desktop) {
                 apply_prefs (manager);
+        } else {
+                g_timeout_add_seconds (8, apply_prefs, manager);
         }
 
         gnome_settings_profile_end (NULL);