Merge lp:~om26er/ubuntu/natty/libdbusmenu/dbusmenu-fix-618587 into lp:ubuntu/natty/libdbusmenu

[Omer Akram]

backport the fix for lp: 618587 for Natty.

Unmerged revisions

85. By Omer Akram on 2011-08-17

* libdbusmenu-gtk/parser.c:
  - Eclipse does not work with appmenu. (LP: #618587)

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-19 15:14:23 +0000
+++ debian/changelog	2011-08-17 13:41:23 +0000
@@ -1,3 +1,10 @@
+libdbusmenu (0.4.3-0ubuntu4) natty; urgency=low
+
+  * libdbusmenu-gtk/parser.c:
+    - Eclipse does not work with appmenu. (LP: #618587)
+
+ -- Omer Akram <[e-mail]>  Wed, 17 Aug 2011 18:27:45 +0500
+
 libdbusmenu (0.4.3-0ubuntu3) natty; urgency=low
 
   * Backport bug fixes from trunk:
 
=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c	2011-04-15 15:55:37 +0000
+++ libdbusmenu-gtk/parser.c	2011-08-17 13:41:23 +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