gnome-settings-daemon r144 - in trunk: . plugins/background

[jensg svn gnome org]

Author: jensg
Date: Thu Feb 14 17:54:31 2008
New Revision: 144
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=144&view=rev

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

	* plugins/background/gsd-background-manager.c:
	(gsd_background_manager_start): at startup, don't apply background
	prefs twice and don't check for nautilus running since we're usually
	started first


Modified:
   trunk/ChangeLog
   trunk/plugins/background/gsd-background-manager.c

Modified: trunk/plugins/background/gsd-background-manager.c
==============================================================================
--- trunk/plugins/background/gsd-background-manager.c	(original)
+++ trunk/plugins/background/gsd-background-manager.c	Thu Feb 14 17:54:31 2008
@@ -285,12 +285,10 @@
                           manager);
         bg_preferences_load (manager->priv->prefs);
 
-        apply_prefs (manager);
-
         client = gconf_client_get_default ();
         gconf_client_notify_add (client,
                                  "/desktop/gnome/background",
-                                 (GConfClientNotifyFunc)background_callback,
+                                 (GConfClientNotifyFunc) background_callback,
                                  manager,
                                  NULL,
                                  NULL);