Merge lp:~chrisccoulson/libdbusmenu/set-cached-menuitem into lp:libdbusmenu/0.5

[Chris Coulson]

Whilst investigating bug 723463, I wrote a small Python test application which just rapidly added/removed menus from the menubar at random, and noticed that under most conditions, menus were not being removed from the menubar when being removed from the application.

Initially, it seemed this might be related to bug 723463, but after some more digging I realised this problem was actually occurring on the application side (I wasn't seeing menuitem_child_removed being called in DbusmenuServer, and other weird things were happening such as widget_notfy_cb was being called in the parser with pscpec=submenu, but no DbusmenuMenuitem associated with the widget).

Then, I realised that we never actually set CACHED_MENUITEM anywhere in the parser!

This branch fixes this. As a side-effect of this, calling dbusmenu_gtk_parse_menu_structure more than once on the same GtkWidget will result in the immediate children of that widget already having another DbusmenuMenuitem parent (the original root item), so we have to unreparent these where this happens.

[Chris Coulson (chrisccoulson)]

Oh, this actually fixes bug 729128

[Ted Gould (ted)]

Heh, I actually had a branch fixing this. You Desktopers are too fast! I'll get you next time! :)

review: Approve

=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c	2011-03-01 17:41:58 +0000
+++ libdbusmenu-gtk/parser.c	2011-03-08 23:11:57 +0000
@@ -219,6 +219,7 @@
 
 	pdata->widget = widget;
 	g_object_add_weak_pointer(G_OBJECT (widget), (gpointer*)&pdata->widget);
+	g_object_set_data(G_OBJECT(widget), CACHED_MENUITEM, item);
 
 	return item;
 }
@@ -311,6 +312,10 @@
 
 			/* Oops, let's tell our parents about us */
 			if (peek == NULL) {
+				if (dbusmenu_menuitem_get_parent(thisitem) != NULL) {
+					dbusmenu_menuitem_unparent(thisitem);
+				}
+
 				gint pos = get_child_position (widget);
 				if (pos >= 0)
 					dbusmenu_menuitem_child_add_position (recurse->parent,