Make sure we disconnect from all our signals and free from memory that really exists. Lots of little nasty bugs.

2 files changed, 16 insertions, 9 deletions

diff --git a/src/im-menu-item.c b/src/im-menu-item.c
index 737c609..6e3a461 100644
--- a/src/im-menu-item.c
+++ b/src/im-menu-item.c
@@ -44,6 +44,7 @@ struct _ImMenuItemPrivate
 
 	glong seconds;
 	gboolean show_time;
+	gulong indicator_changed;
 
 	guint time_update_min;
 
@@ -171,6 +172,11 @@ im_menu_item_dispose (GObject *object)
 	if (priv->time_update_min != 0) {
 		g_source_remove(priv->time_update_min);
 	}
+
+	g_signal_handler_disconnect(priv->listener, priv->indicator_changed);
+	priv->indicator_changed = 0;
+
+	return;
 }
 
 static void
@@ -326,7 +332,7 @@ indicator_modified_cb (IndicateListener * listener, IndicateListenerServer * ser
 
 	/* Not meant for us */
 	if (INDICATE_LISTENER_INDICATOR_ID(indicator) != INDICATE_LISTENER_INDICATOR_ID(priv->indicator)) return;
-	if (g_strcmp0(INDICATE_LISTENER_SERVER_DBUS_NAME(server), INDICATE_LISTENER_SERVER_DBUS_NAME(priv->server))) return;
+	if (server != priv->server) return;
 
 	if (!g_strcmp0(property, "sender")) {
 		indicate_listener_get_property(listener, server, indicator, "sender", sender_cb, self);	
@@ -358,7 +364,7 @@ im_menu_item_new (IndicateListener * listener, IndicateListenerServer * server,
 	indicate_listener_get_property_icon(listener, server, indicator, "icon",   icon_cb, self);	
 
 	g_signal_connect(G_OBJECT(self), "activate", G_CALLBACK(activate_cb), NULL);
-	g_signal_connect(G_OBJECT(listener), INDICATE_LISTENER_SIGNAL_INDICATOR_MODIFIED, G_CALLBACK(indicator_modified_cb), self);
+	priv->indicator_changed = g_signal_connect(G_OBJECT(listener), INDICATE_LISTENER_SIGNAL_INDICATOR_MODIFIED, G_CALLBACK(indicator_modified_cb), self);
 
 	return self;
 }
diff --git a/src/indicator-messages.c b/src/indicator-messages.c
index b988537..efe2dcb 100644
--- a/src/indicator-messages.c
+++ b/src/indicator-messages.c
@@ -81,6 +81,7 @@ struct _imList_t {
 	IndicateListenerServer * server;
 	IndicateListenerIndicator * indicator;
 	GtkWidget * menuitem;
+	gulong timechange_cb;
 };
 
 static gboolean
@@ -380,7 +381,7 @@ subtype_cb (IndicateListener * listener, IndicateListenerServer * server, Indica
 
 		g_debug("Adding to IM List");
 		sl_item->imList = g_list_insert_sorted(sl_item->imList, listItem, imList_sort);
-		g_signal_connect(G_OBJECT(menuitem), IM_MENU_ITEM_SIGNAL_TIME_CHANGED, G_CALLBACK(im_time_changed), sl_item);
+		listItem->timechange_cb = g_signal_connect(G_OBJECT(menuitem), IM_MENU_ITEM_SIGNAL_TIME_CHANGED, G_CALLBACK(im_time_changed), sl_item);
 
 		g_debug("Placing in Shell");
 		menushell_location_t msl;
@@ -444,19 +445,19 @@ indicator_removed (IndicateListener * listener, IndicateListenerServer * server,
 
 	GList * listItem = g_list_find_custom(sl_item->imList, &listData, imList_equal);
 	GtkWidget * menuitem = NULL;
+	imList_t * ilt = NULL;
 	if (listItem != NULL) {
-		menuitem = ((imList_t *)listItem->data)->menuitem;
+		ilt = (imList_t *)listItem->data;
+		menuitem = ilt->menuitem;
 	}
 
 	if (!removed && menuitem != NULL) {
-		g_object_ref(menuitem);
-		g_free(listItem->data);
-		sl_item->imList = g_list_remove(sl_item->imList, listItem->data);
+		sl_item->imList = g_list_remove(sl_item->imList, ilt);
+		g_signal_handler_disconnect(menuitem, ilt->timechange_cb);
+		g_free(ilt);
 
 		gtk_widget_hide(menuitem);
 		gtk_container_remove(GTK_CONTAINER(data), menuitem);
-
-		g_object_unref(menuitem);
 		removed = TRUE;
 	}