Merge lp:~mterry/libdbusmenu/eclipse-rcp into lp:libdbusmenu/0.5

[Michael Terry]

Yay, I finally figured out Eclipse and its RCP framework. Combined with the already-merged work for Emacs, this is the last piece.

This toggles the visibility of any menus we come across, which -- much like the fake 'activation' we do on toplevel items -- triggers RCP to fill out the menu.

I've tested this with both a sample RCP app and Eclipse itself (after disabling the blacklist in appmenu-gtk).

[Michael Terry (mterry)]

Sorry, I should mention that it doesn't fix *all* issues with the menus. In particular, shortcuts still don't work right. But it's a lot of the way there.

[Michael Terry (mterry)]

Oy, and I forgot to get rid of the idle callback if the menuitem goes away. Don't merge this yet, I guess. I'll update with that fix.

[Ted Gould (ted)]

On Thu, 2011-04-28 at 13:45 +0000, Michael Terry wrote:
> Oy, and I forgot to get rid of the idle callback if the
> menuitem goes away. Don't merge this yet, I guess. I'll
> update with that fix.

It seems you could just ref() it? Seems that even if it survived a
little bit longer that wouldn't cause any harm.

[Ronald Kinard (furyhunter)]

If this change is merged, will it make it into Natty's package?

[Ted Gould (ted)]

Uhm, that'd would be the choice of the Ubuntu Desktop Team, but I'm willing to commit it to the dbusmenu 0.4 branch which would make it possible for them to put into Natty.

[Michael Terry (mterry)]

Finally got back to this and fixed the ref issue like you suggested, Ted. Please re-review this.

[lp:~mterry/libdbusmenu/eclipse-rcp]

304. By Michael Terry on 2011-05-18

ref menu until we're done toggling its visibility

[Ted Gould (ted)]

Looks good.

review: Approve

[Ted Gould (ted)]

I also merged this into the 0.4 branch.

=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c	2011-04-27 02:39:06 +0000
+++ libdbusmenu-gtk/parser.c	2011-05-18 18:20:51 +0000
@@ -270,6 +270,16 @@
 	return item;
 }
 
+static gboolean
+toggle_widget_visibility (GtkWidget * widget)
+{
+	gboolean vis = gtk_widget_get_visible (widget);
+	gtk_widget_set_visible (widget, !vis);
+	gtk_widget_set_visible (widget, vis);
+	g_object_unref (G_OBJECT (widget));
+	return FALSE;
+}
+
 static void
 watch_submenu(DbusmenuMenuitem * mi, GtkWidget * menu)
 {
@@ -285,6 +295,14 @@
 		          G_CALLBACK (child_removed_cb),
 		          mi);
 	g_object_add_weak_pointer(G_OBJECT (menu), (gpointer*)&pdata->shell);
+
+	/* Some apps (notably Eclipse RCP apps) don't fill contents of submenus
+	   until the menu is shown.  So we fake that by toggling the visibility of
+	   any submenus we come across.  Further, these apps need it done with a
+	   delay while they finish initializing, so we put the call in the idle
+	   queue. */
+	g_idle_add((GSourceFunc)toggle_widget_visibility,
+	           g_object_ref (G_OBJECT (menu)));
 }
 
 static void