diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:14:20 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:14:20 +0200 |
| commit | 674342c670052bcfcc92b7638de9af482ae2a856 (patch) | |
| tree | 0432b0802a7b35beaac76d51d797219a4b586d80 /libdbusmenu-gtk/client.c | |
| parent | 6830905830ac78271515c586442a090cf7a0e3ff (diff) | |
| parent | 271f62baede153472711c3dcf2388df3acffa006 (diff) | |
| download | libdbusmenu-674342c670052bcfcc92b7638de9af482ae2a856.tar.gz libdbusmenu-674342c670052bcfcc92b7638de9af482ae2a856.tar.bz2 libdbusmenu-674342c670052bcfcc92b7638de9af482ae2a856.zip | |
Merged lp:~ubuntu-desktop/dbusmenu/ubuntu
* New upstream release.
∘ Protect against NULL nodes (LP: #602444)
∘ Remove extra warnings and messages
∘ Handle not having a session bus better (LP: #598715)
* New upstream release.
* Block building submenus on separators (LP: #598620)
* Adding more through JSON support for testing
* Fixing up value handling in dbusmenu-dumper
* debian/control, debian/libdbusmenu-jsonloader*install: Adding
two binary packages for the jsonloader test library.
* Merge Ubuntu.
Preserve Maintainer and Vcs-* fields.
* Standards-Version: 3.9.0
* Source-Format: 1.0 for now
- -doc packages are Arch:all
Diffstat (limited to 'libdbusmenu-gtk/client.c')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index c73c90f..b406697 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -148,7 +148,9 @@ do_swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) { return FALSE; } + #ifdef MASSIVEDEBUGGING g_debug("Setting shortcut on '%s': %d %X", dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL), key, modifiers); + #endif GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(data->client, mi); if (gmi == NULL) { @@ -503,6 +505,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); |