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

Proposed by Omer Akram on 2011-08-17
Status: Rejected
Rejected by: Martin Pitt on 2011-10-25
Proposed branch: lp:~om26er/ubuntu/natty/libdbusmenu/dbusmenu-fix-618587
Merge into: lp:ubuntu/natty/libdbusmenu
Diff against target: 50 lines (+25/-0)
2 files modified
debian/changelog (+7/-0)
libdbusmenu-gtk/parser.c (+18/-0)
To merge this branch: bzr merge lp:~om26er/ubuntu/natty/libdbusmenu/dbusmenu-fix-618587
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team 2011-08-17 Pending
Review via email: mp+71892@code.launchpad.net

Description of the Change

backport the fix for lp: 618587 for Natty.

To post a comment you must log in.

Unmerged revisions

85. By Omer Akram on 2011-08-17

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-04-19 15:14:23 +0000
3+++ debian/changelog 2011-08-17 13:41:23 +0000
4@@ -1,3 +1,10 @@
5+libdbusmenu (0.4.3-0ubuntu4) natty; urgency=low
6+
7+ * libdbusmenu-gtk/parser.c:
8+ - Eclipse does not work with appmenu. (LP: #618587)
9+
10+ -- Omer Akram <om26er@ubuntu.com> Wed, 17 Aug 2011 18:27:45 +0500
11+
12 libdbusmenu (0.4.3-0ubuntu3) natty; urgency=low
13
14 * Backport bug fixes from trunk:
15
16=== modified file 'libdbusmenu-gtk/parser.c'
17--- libdbusmenu-gtk/parser.c 2011-04-15 15:55:37 +0000
18+++ libdbusmenu-gtk/parser.c 2011-08-17 13:41:23 +0000
19@@ -270,6 +270,16 @@
20 return item;
21 }
22
23+static gboolean
24+toggle_widget_visibility (GtkWidget * widget)
25+{
26+ gboolean vis = gtk_widget_get_visible (widget);
27+ gtk_widget_set_visible (widget, !vis);
28+ gtk_widget_set_visible (widget, vis);
29+ g_object_unref (G_OBJECT (widget));
30+ return FALSE;
31+}
32+
33 static void
34 watch_submenu(DbusmenuMenuitem * mi, GtkWidget * menu)
35 {
36@@ -285,6 +295,14 @@
37 G_CALLBACK (child_removed_cb),
38 mi);
39 g_object_add_weak_pointer(G_OBJECT (menu), (gpointer*)&pdata->shell);
40+
41+ /* Some apps (notably Eclipse RCP apps) don't fill contents of submenus
42+ until the menu is shown. So we fake that by toggling the visibility of
43+ any submenus we come across. Further, these apps need it done with a
44+ delay while they finish initializing, so we put the call in the idle
45+ queue. */
46+ g_idle_add((GSourceFunc)toggle_widget_visibility,
47+ g_object_ref (G_OBJECT (menu)));
48 }
49
50 static void

Subscribers

People subscribed via source and target branches

to all changes: