[Xfce4-commits] r24708 - squeeze/trunk/src

[Stephan Arts]

Author: stephan
Date: 2007-01-23 14:23:41 +0000 (Tue, 23 Jan 2007)
New Revision: 24708

Modified:
   squeeze/trunk/src/archive_store.c
   squeeze/trunk/src/navigation_bar.c
   squeeze/trunk/src/widget_factory.c
Log:
fixed bugs

Modified: squeeze/trunk/src/archive_store.c
===================================================================
--- squeeze/trunk/src/archive_store.c	2007-01-23 13:51:53 UTC (rev 24707)
+++ squeeze/trunk/src/archive_store.c	2007-01-23 14:23:41 UTC (rev 24708)
@@ -62,6 +62,8 @@
 };
 static gint sq_archive_store_signals[SQ_ARCHIVE_STORE_SIGNAL_COUNT];
 
+static GObjectClass *parent_class;
+
 static void
 sq_archive_store_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void
@@ -238,6 +240,8 @@
 	object_class->get_property = sq_archive_store_get_property;
 	object_class->dispose = sq_archive_store_dispose;
 
+	parent_class = gtk_type_class (G_TYPE_OBJECT);
+
 	pspec = g_param_spec_boolean("show-icons",
 		_("Show mime icons"),
 		_("Show the mime type icons for each entry"),
@@ -1688,4 +1692,5 @@
 		g_object_unref(store->archive);
 		store->archive = NULL;
 	}
+	parent_class->dispose(object);
 }

Modified: squeeze/trunk/src/navigation_bar.c
===================================================================
--- squeeze/trunk/src/navigation_bar.c	2007-01-23 13:51:53 UTC (rev 24707)
+++ squeeze/trunk/src/navigation_bar.c	2007-01-23 14:23:41 UTC (rev 24708)
@@ -100,9 +100,15 @@
 	if(navigation_bar->store)
 	{
 		if(navigation_bar->_cb_pwd_changed)
+		{
 			g_signal_handlers_disconnect_by_func(navigation_bar->store, navigation_bar->_cb_pwd_changed, navigation_bar);
+			navigation_bar->_cb_pwd_changed = NULL;
+		}
 		if(navigation_bar->_cb_new_archive)
+		{
 			g_signal_handlers_disconnect_by_func(navigation_bar->store, navigation_bar->_cb_new_archive, navigation_bar);
+			navigation_bar->_cb_new_archive = NULL;
+		}
 		navigation_bar->store = NULL;
 	}
 	parent_class->dispose(object);
@@ -114,9 +120,16 @@
 	if(navigation_bar->store)
 	{
 		if(navigation_bar->_cb_pwd_changed)
+		{
 			g_signal_handlers_disconnect_by_func(navigation_bar->store, navigation_bar->_cb_pwd_changed, navigation_bar);
+			navigation_bar->_cb_pwd_changed = NULL;
+		}
 		if(navigation_bar->_cb_new_archive)
+		{
 			g_signal_handlers_disconnect_by_func(navigation_bar->store, navigation_bar->_cb_new_archive, navigation_bar);
+			navigation_bar->_cb_new_archive = NULL;
+		}
+		navigation_bar->store = NULL;
 	}
 
 	navigation_bar->store = store;

Modified: squeeze/trunk/src/widget_factory.c
===================================================================
--- squeeze/trunk/src/widget_factory.c	2007-01-23 13:51:53 UTC (rev 24707)
+++ squeeze/trunk/src/widget_factory.c	2007-01-23 14:23:41 UTC (rev 24708)
@@ -133,7 +133,7 @@
 	g_object_set_data(G_OBJECT(check), SQ_PROPERTY_SPEC_DATA, pspec);
 	g_signal_connect(G_OBJECT(check), "toggled", G_CALLBACK(cb_sq_widget_factory_property_changed), obj);
 	g_signal_connect(obj, "notify", G_CALLBACK(cb_sq_widget_factory_property_notify), check);
-	g_signal_connect(GTK_OBJECT(check), "destroy", G_CALLBACK(cb_sq_widget_factory_widget_destroyed), obj);
+	g_signal_connect(GTK_OBJECT(check), "dispose", G_CALLBACK(cb_sq_widget_factory_widget_destroyed), obj);
 
 	const gchar *large_tip = g_param_spec_get_blurb(pspec);
 	gchar *small_tip = NULL;