ayatana-commits team mailing list archive
-
ayatana-commits team
-
Mailing list archive
-
Message #03257
[Branch ~dbusmenu-team/dbusmenu/trunk] Rev 245: Adding a weak pointer to the submenu
Merge authors:
Chris Coulson (chrisccoulson)
Related merge proposals:
https://code.launchpad.net/~chrisccoulson/dbusmenu/bluetooth-applet-fix/+merge/51764
proposed by: Chris Coulson (chrisccoulson)
review: Approve - Ted Gould (ted)
------------------------------------------------------------
revno: 245 [merge]
committer: Ted Gould <ted@xxxxxxxx>
branch nick: trunk
timestamp: Tue 2011-03-01 11:24:25 -0600
message:
Adding a weak pointer to the submenu
modified:
libdbusmenu-gtk/parser.c
--
lp:dbusmenu
https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk
Your team ayatana-commits is subscribed to branch lp:dbusmenu.
To unsubscribe from this branch go to https://code.launchpad.net/~dbusmenu-team/dbusmenu/trunk/+edit-subscription
=== modified file 'libdbusmenu-gtk/parser.c'
--- libdbusmenu-gtk/parser.c 2011-02-28 14:56:59 +0000
+++ libdbusmenu-gtk/parser.c 2011-03-01 17:24:25 +0000
@@ -456,6 +456,17 @@
}
}
+ GtkWidget *submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
+ if (submenu)
+ {
+ pdata->shell = submenu;
+ g_signal_connect (G_OBJECT (submenu),
+ "child-added",
+ G_CALLBACK (child_added_cb),
+ mi);
+ g_object_add_weak_pointer(G_OBJECT(submenu), (gpointer*)&pdata->shell);
+ }
+
if (!g_object_get_data (G_OBJECT (widget), "gtk-empty-menu-item") && !GTK_IS_TEAROFF_MENU_ITEM (widget))
{
visible = gtk_widget_get_visible (widget);