From aa58b4c6b6460a8f9e49953447994b479b9f1705 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 29 Jun 2010 18:12:08 -0500 Subject: Block separators from getting new submenus --- libdbusmenu-gtk/client.c | 1 + 1 file changed, 1 insertion(+) 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); -- cgit v1.2.3 From b2e5fa7dd54d2d73201624b1411bf7387fde0157 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 29 Jun 2010 19:10:51 -0500 Subject: releasing version 0.3.3-0ubuntu2~ppa2~json3~subs1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 893f480..b25812d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -libdbusmenu (0.3.3-0ubuntu2~ppa2~json3~subs1) UNRELEASED; urgency=low +libdbusmenu (0.3.3-0ubuntu2~ppa2~json3~subs1) lucid; urgency=low * Upstream merge * Block building submenus on separators - -- Ted Gould Tue, 29 Jun 2010 19:06:44 -0500 + -- Ted Gould Tue, 29 Jun 2010 19:10:49 -0500 libdbusmenu (0.3.3-0ubuntu2~ppa2~json2) lucid; urgency=low -- cgit v1.2.3