diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-03-29 11:33:24 -0700 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-03-29 11:33:24 -0700 |
| commit | bc392e208fa1f9b46c77ea8142dadd629722663a (patch) | |
| tree | 360ea9101d0ae45fdba3e3a15d4eaab7de587793 /libdbusmenu-gtk | |
| parent | ebab055ed741101f59c320367eb8be7484555a48 (diff) | |
| parent | 86df02fa5a703cacd492db1b999f9449c3247c6b (diff) | |
| download | libdbusmenu-bc392e208fa1f9b46c77ea8142dadd629722663a.tar.gz libdbusmenu-bc392e208fa1f9b46c77ea8142dadd629722663a.tar.bz2 libdbusmenu-bc392e208fa1f9b46c77ea8142dadd629722663a.zip | |
Import upstream version 0.5.96
Diffstat (limited to 'libdbusmenu-gtk')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index f507a56..60af93f 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -787,22 +787,13 @@ menu_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * variant, Db process_disposition(mi, gmi, variant, gtkclient); } else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_ACCESSIBLE_DESC)) { process_a11y_desc(mi, gmi, variant, gtkclient); + } else if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_SHORTCUT)) { + refresh_shortcut(gtkclient, mi); } return; } -/* Special handler for the shortcut changing as we need to have the - client for that one to get the accel group. */ -static void -menu_shortcut_change_cb (DbusmenuMenuitem * mi, gchar * prop, GVariant * value, DbusmenuGtkClient * client) -{ - if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_SHORTCUT)) { - refresh_shortcut(client, mi); - } - return; -} - /* The new menuitem signal only happens if we don't have a type handler for the type of the item. This should be an error condition and we're printing out a message. */ @@ -918,7 +909,6 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * /* DbusmenuMenuitem signals */ g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_prop_change_cb), client); - g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED, G_CALLBACK(menu_shortcut_change_cb), client); g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED, G_CALLBACK(delete_child), client); g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED, G_CALLBACK(move_child), client); |