diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | libdbusmenu-gtk/client.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index f719612..893f480 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdbusmenu (0.3.3-0ubuntu2~ppa2~json3~subs1) UNRELEASED; urgency=low + + * Upstream merge + * Block building submenus on separators + + -- Ted Gould <ted@ubuntu.com> Tue, 29 Jun 2010 19:06:44 -0500 + libdbusmenu (0.3.3-0ubuntu2~ppa2~json2) lucid; urgency=low * debian/libdbusmenu-jsonloader0 moving to 1 to match diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index c73c90f..a46aef3 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -503,6 +503,7 @@ new_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position, Dbus #endif if (dbusmenu_menuitem_get_root(mi)) { return; } + if (g_strcmp0(dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_TYPE), DBUSMENU_CLIENT_TYPES_SEPARATOR) == 0) { return; } gpointer ann_menu = g_object_get_data(G_OBJECT(mi), data_menu); GtkMenu * menu = GTK_MENU(ann_menu); |