Merge lp:~ted/libdbusmenu/lp746091 into lp:libdbusmenu/0.5

[Ted Gould]

Make the destruction cleaner.

[lp:~ted/libdbusmenu/lp746091]

296. By Ted Gould on 2011-04-11

Attaching the data in a way that it'll cleanup itself

297. By Ted Gould on 2011-04-11

Protecting the label with the null check and don't unref something that shouldn't be.

298. By Ted Gould on 2011-04-11

Passing the menuitem instead of finding it.

299. By Ted Gould on 2011-04-11

Ensuring all the menus are hidden before unref'ing root

=== modified file 'libdbusmenu-glib/client-menuitem.c'
--- libdbusmenu-glib/client-menuitem.c	2011-02-21 18:55:10 +0000
+++ libdbusmenu-glib/client-menuitem.c	2011-04-11 04:46:25 +0000
@@ -106,7 +106,7 @@
 handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp)
 {
 	DbusmenuClientMenuitemPrivate * priv = DBUSMENU_CLIENT_MENUITEM_GET_PRIVATE(mi);
-	dbusmenu_client_send_event(priv->client, dbusmenu_menuitem_get_id(mi), name, variant, timestamp);
+	dbusmenu_client_send_event(priv->client, dbusmenu_menuitem_get_id(mi), name, variant, timestamp, mi);
 	return;
 }
 
 
=== modified file 'libdbusmenu-glib/client-private.h'
--- libdbusmenu-glib/client-private.h	2011-02-21 18:55:10 +0000
+++ libdbusmenu-glib/client-private.h	2011-04-11 04:46:25 +0000
@@ -37,7 +37,8 @@
                                                         gint id,
                                                         const gchar * name,
                                                         GVariant * variant,
-                                                        guint timestamp);
+                                                        guint timestamp,
+                                                        DbusmenuMenuitem * mi);
 void                 dbusmenu_client_send_about_to_show(DbusmenuClient * client,
                                                         gint id,
                                                         void (*cb) (gpointer user_data),
 
=== modified file 'libdbusmenu-glib/client.c'
--- libdbusmenu-glib/client.c	2011-04-07 15:04:04 +0000
+++ libdbusmenu-glib/client.c	2011-04-11 04:46:25 +0000
@@ -1516,14 +1516,13 @@
 /* Sends the event over DBus to the server on the other side
    of the bus. */
 void
-dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, GVariant * variant, guint timestamp)
+dbusmenu_client_send_event (DbusmenuClient * client, gint id, const gchar * name, GVariant * variant, guint timestamp, DbusmenuMenuitem * mi)
 {
 	g_return_if_fail(DBUSMENU_IS_CLIENT(client));
 	g_return_if_fail(id >= 0);
 	g_return_if_fail(name != NULL);
 
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
-	DbusmenuMenuitem * mi = dbusmenu_menuitem_find_id(priv->root, id);
 	if (mi == NULL) {
 		g_warning("Asked to activate a menuitem %d that we don't know about", id);
 		return;
 
=== modified file 'libdbusmenu-gtk/client.c'
--- libdbusmenu-gtk/client.c	2011-04-05 18:38:28 +0000
+++ libdbusmenu-gtk/client.c	2011-04-11 04:46:25 +0000
@@ -571,7 +571,8 @@
 	} else {
 		/* We need to build a menu for these guys to live in. */
 		GtkMenu * menu = GTK_MENU(gtk_menu_new());
-		g_object_set_data(G_OBJECT(mi), data_menu, menu);
+		g_object_ref_sink(menu);
+		g_object_set_data_full(G_OBJECT(mi), data_menu, menu, g_object_unref);
 
 		gtk_menu_item_set_submenu(gmi, GTK_WIDGET(menu));
 
@@ -616,19 +617,6 @@
 	return;
 }
 
-/* Call back that happens when the DbusmenuMenuitem
-   is destroyed.  We're making sure to clean up everything
-   else down the pipe. */
-static void
-destoryed_dbusmenuitem_cb (gpointer udata, GObject * dbusmenuitem)
-{
-	#ifdef MASSIVEDEBUGGING
-	g_debug("DbusmenuMenuitem was destroyed");
-	#endif
-	gtk_widget_destroy(GTK_WIDGET(udata));
-	return;
-}
-
 /* The new menuitem signal only happens if we don't have a type handler
    for the type of the item.  This should be an error condition and we're
    printing out a message. */
@@ -731,11 +719,8 @@
 	#endif
 
 	/* Attach these two */
-	g_object_set_data(G_OBJECT(item), data_menuitem, gmi);
-	g_object_ref(G_OBJECT(gmi));
-	#ifdef MASSIVEDEBUGGING
-	g_signal_connect(G_OBJECT(gmi), "destroy", G_CALLBACK(destroy_gmi), item);
-	#endif
+	g_object_ref_sink(G_OBJECT(gmi));
+	g_object_set_data_full(G_OBJECT(item), data_menuitem, gmi, (GDestroyNotify)gtk_widget_destroy);
 
 	/* DbusmenuMenuitem signals */
 	g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), client);
@@ -746,9 +731,6 @@
 	/* GtkMenuitem signals */
 	g_signal_connect(G_OBJECT(gmi), "activate", G_CALLBACK(menu_pressed_cb), item);
 
-	/* Life insurance */
-	g_object_weak_ref(G_OBJECT(item), destoryed_dbusmenuitem_cb, gmi);
-
 	/* Check our set of props to see if any are set already */
 	process_visible(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_VISIBLE));
 	process_sensitive(item, gmi, dbusmenu_menuitem_property_get_variant(item, DBUSMENU_MENUITEM_PROP_ENABLED));
@@ -801,7 +783,7 @@
 
 		if (menu != NULL) {
 			gtk_widget_destroy(GTK_WIDGET(menu));
-			g_object_set_data(G_OBJECT(mi), data_menu, NULL);
+			g_object_steal_data(G_OBJECT(mi), data_menu);
 		}
 	}
 
@@ -905,11 +887,10 @@
 
 	GtkMenuItem * gmi;
 	gmi = GTK_MENU_ITEM(g_object_new(GENERICMENUITEM_TYPE, NULL));
-	gtk_menu_item_set_label(gmi, dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL));
 
 	if (gmi != NULL) {
+		gtk_menu_item_set_label(gmi, dbusmenu_menuitem_property_get(newitem, DBUSMENU_MENUITEM_PROP_LABEL));
 		dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent);
-		g_object_unref(gmi);
 	} else {
 		return FALSE;
 	}
 
=== modified file 'libdbusmenu-gtk/menu.c'
--- libdbusmenu-gtk/menu.c	2011-02-21 20:13:29 +0000
+++ libdbusmenu-gtk/menu.c	2011-04-11 04:46:25 +0000
@@ -329,6 +329,18 @@
 	return;
 }
 
+/* Handler for all of the menu items on a root change to ensure that
+   the menus are hidden before we start going and deleting things. */
+static void
+popdown_all (DbusmenuMenuitem * mi, gpointer user_data)
+{
+	GtkMenu * menu = dbusmenu_gtkclient_menuitem_get_submenu(DBUSMENU_GTKCLIENT(user_data), mi);
+	if (menu != NULL) {
+		gtk_menu_popdown(menu);
+	}
+	return;
+}
+
 /* When the root menuitem changes we need to resetup things so that
    we're back in the game. */
 static void
@@ -344,6 +356,8 @@
 		g_signal_handlers_disconnect_by_func(G_OBJECT(priv->root), root_child_moved, menu);
 		g_signal_handlers_disconnect_by_func(G_OBJECT(priv->root), root_child_delete, menu);
 
+		dbusmenu_menuitem_foreach(priv->root, popdown_all, client);
+
 		g_object_unref(priv->root);
 		priv->root = NULL;
 	}