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

[jensg svn gnome org]

Author: jensg
Date: Tue May 13 20:16:50 2008
New Revision: 338
URL: http://svn.gnome.org/viewvc/gnome-settings-daemon?rev=338&view=rev

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

	* plugins/background/gsd-background-manager.c:
	(gsd_background_manager_start): reuse the GConf client we already
	have


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	Tue May 13 20:16:50 2008
@@ -238,7 +238,6 @@
 gsd_background_manager_start (GsdBackgroundManager *manager,
                               GError              **error)
 {
-        GConfClient *client;
         gboolean nautilus_show_desktop;
 
         g_debug ("Starting background manager");
@@ -263,11 +262,9 @@
 	 * don't waste time setting the background only to have
 	 * nautilus overwrite it.
 	 */
-        client = gconf_client_get_default ();
-        nautilus_show_desktop = gconf_client_get_bool (client,
+        nautilus_show_desktop = gconf_client_get_bool (manager->priv->client,
                                                        "/apps/nautilus/preferences/show_desktop",
                                                        NULL);
-        g_object_unref (client);
 
         if (!nautilus_show_desktop) {
                 draw_background (manager);