diff options
| author | Ted Gould <ted@gould.cx> | 2010-06-30 12:27:55 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-06-30 12:27:55 -0500 |
| commit | 53e43d85815314ffaee65134f6f189b6844103b0 (patch) | |
| tree | e293009823decfd830ecf586d4b118994eadb6f3 /libdbusmenu-gtk | |
| parent | 77d8d38ae304d0ed893f39902e6e461b1e9f7c15 (diff) | |
| parent | b9ec76e3862c882d913efca81e20228e0d6313af (diff) | |
| download | libdbusmenu-53e43d85815314ffaee65134f6f189b6844103b0.tar.gz libdbusmenu-53e43d85815314ffaee65134f6f189b6844103b0.tar.bz2 libdbusmenu-53e43d85815314ffaee65134f6f189b6844103b0.zip | |
* Upstream merge
* Block building submenus on separators (LP: #598620)
Diffstat (limited to 'libdbusmenu-gtk')
| -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); |