gnome-session r4840 - in branches/dbus_based: . gnome-session

[mccann svn gnome org]

Author: mccann
Date: Fri Jul 25 01:37:05 2008
New Revision: 4840
URL: http://svn.gnome.org/viewvc/gnome-session?rev=4840&view=rev

Log:
2008-07-24  William Jon McCann  <jmccann redhat com>

	* gnome-session/gconf.c (gsm_gconf_check):
	Remove gsm_gconf_get_client.
	* gnome-session/gsm-autostart-app.c (is_disabled):
	Don't leak a gconf client.
	Pointed out by Matthias Clasen <mclasen redhat com>



Modified:
   branches/dbus_based/ChangeLog
   branches/dbus_based/gnome-session/gconf.c
   branches/dbus_based/gnome-session/gsm-autostart-app.c

Modified: branches/dbus_based/gnome-session/gconf.c
==============================================================================
--- branches/dbus_based/gnome-session/gconf.c	(original)
+++ branches/dbus_based/gnome-session/gconf.c	Fri Jul 25 01:37:05 2008
@@ -32,7 +32,6 @@
 #include "util.h"
 
 static pid_t gsc_pid;
-static GConfClient *client = NULL;
 
 static void unset_display_setup (gpointer user_data);
 
@@ -111,22 +110,6 @@
                                GCONF_SANITY_CHECK, status);
 	}
     }
-
-  client = gconf_client_get_default ();
-}
-
-/**
- * gsm_gconf_get_client:
- *
- * Retrieves the global GConf client. (Assumes gsm_gconf_init() and
- * gsm_gconf_check() have already been called.)
- *
- * Return value: the global #GConfClient
- **/
-GConfClient *
-gsm_gconf_get_client (void)
-{
-  return client;
 }
 
 /**

Modified: branches/dbus_based/gnome-session/gsm-autostart-app.c
==============================================================================
--- branches/dbus_based/gnome-session/gsm-autostart-app.c	(original)
+++ branches/dbus_based/gnome-session/gsm-autostart-app.c	Fri Jul 25 01:37:05 2008
@@ -489,8 +489,9 @@
                                                                  gconf_condition_cb,
                                                                  app, NULL, NULL);
                                 }
+                                g_object_unref (client);
                         } else {
-                                                disabled = FALSE;
+                                disabled = FALSE;
                         }
                 } else {
                         disabled = TRUE;