nautilus-open-terminal r190 - trunk/src

[cneumair svn gnome org]

Author: cneumair
Date: Fri Apr 25 17:46:46 2008
New Revision: 190
URL: http://svn.gnome.org/viewvc/nautilus-open-terminal?rev=190&view=rev

Log:
Do not weak ref the GConf client, do not assert it is NULL in class_finalize(). Instead, just unref and unset the pointer.
We share the GConf client with Nautilus, so there is no guarantee about the actual ref count.


Modified:
   trunk/src/nautilus-open-terminal.c

Modified: trunk/src/nautilus-open-terminal.c
==============================================================================
--- trunk/src/nautilus-open-terminal.c	(original)
+++ trunk/src/nautilus-open-terminal.c	Fri Apr 25 17:46:46 2008
@@ -643,8 +643,6 @@
 {
 	g_assert (gconf_client == NULL);
 	gconf_client = gconf_client_get_default ();
-	g_object_add_weak_pointer (G_OBJECT (gconf_client),
-				   (gpointer *) &gconf_client);
 }
 
 static void
@@ -652,7 +650,7 @@
 {
 	g_assert (gconf_client != NULL);
 	g_object_unref (gconf_client);
-	g_assert (gconf_client == NULL);
+	gconf_client = NULL;
 }
 
 GType