diff options
| author | Ted Gould <ted@gould.cx> | 2010-06-24 08:58:31 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-06-24 08:58:31 -0500 |
| commit | f30496a6eaa445d5fa69f67618f0fa7a3b9b37d7 (patch) | |
| tree | c60e70d94b66bdad12228ca95ea9ef9e82c81be6 /libdbusmenu-gtk/client.c | |
| parent | d5550be789ee837d4fa591540fc323f6b39844d1 (diff) | |
| parent | 5702f60301f134a69493268653e0c05fc2c31ef0 (diff) | |
| download | libdbusmenu-f30496a6eaa445d5fa69f67618f0fa7a3b9b37d7.tar.gz libdbusmenu-f30496a6eaa445d5fa69f67618f0fa7a3b9b37d7.tar.bz2 libdbusmenu-f30496a6eaa445d5fa69f67618f0fa7a3b9b37d7.zip | |
* Upstream merge
* Changing the shortcut implementation to match the Qt
implementation of dbusmenu.
Diffstat (limited to 'libdbusmenu-gtk/client.c')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 91bc816..c73c90f 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -144,12 +144,12 @@ do_swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) { dbusmenu_menuitem_property_get_shortcut(mi, &key, &modifiers); - g_debug("Setting shortcut on '%s': %d %X", dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL), key, modifiers); - if (key == 0) { return FALSE; } + g_debug("Setting shortcut on '%s': %d %X", dbusmenu_menuitem_property_get(mi, DBUSMENU_MENUITEM_PROP_LABEL), key, modifiers); + GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(data->client, mi); if (gmi == NULL) { return FALSE; @@ -197,16 +197,18 @@ refresh_shortcut (DbusmenuGtkClient * client, DbusmenuMenuitem * mi) data.new_agroup = priv->agroup; if (do_swap_agroup(mi, &data)) { - guint key; - GdkModifierType mod; - GtkMenuItem *gmi = dbusmenu_gtkclient_menuitem_get (client, mi); + guint key = 0; + GdkModifierType mod = 0; + GtkMenuItem *gmi = dbusmenu_gtkclient_menuitem_get (client, mi); - dbusmenu_menuitem_property_get_shortcut (mi, &key, &mod); + dbusmenu_menuitem_property_get_shortcut (mi, &key, &mod); - gtk_widget_add_accelerator (GTK_WIDGET (gmi), "activate", priv->agroup, key, mod, GTK_ACCEL_VISIBLE); - } + if (key != 0) { + gtk_widget_add_accelerator (GTK_WIDGET (gmi), "activate", priv->agroup, key, mod, GTK_ACCEL_VISIBLE); + } + } - return; + return; } |