diff options
| author | Ted Gould <ted@gould.cx> | 2010-06-29 19:07:48 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-06-29 19:07:48 -0500 |
| commit | 9431e224ac6dae969dadcb7d4cdc6d7f11fe3896 (patch) | |
| tree | 0143a034573f105b332e0bf239370c8da0d978c7 /libdbusmenu-gtk/client.c | |
| parent | b5238c818f7ce62d0e9f13b25a9a9ffe2b4621f7 (diff) | |
| parent | aa58b4c6b6460a8f9e49953447994b479b9f1705 (diff) | |
| download | libdbusmenu-9431e224ac6dae969dadcb7d4cdc6d7f11fe3896.tar.gz libdbusmenu-9431e224ac6dae969dadcb7d4cdc6d7f11fe3896.tar.bz2 libdbusmenu-9431e224ac6dae969dadcb7d4cdc6d7f11fe3896.zip | |
* Upstream merge
* Block building submenus on separators
Diffstat (limited to 'libdbusmenu-gtk/client.c')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |