ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-appmenu/accelerator-support into lp:indicator-appmenu.

Requested reviews:
  Indicator Applet Developers (indicator-applet-developers)


Adds the indicator side of accelerators.  Needs dbusmenu trunk.
-- 
https://code.launchpad.net/~ted/indicator-appmenu/accelerator-support/+merge/28116
Your team ayatana-commits is subscribed to branch lp:indicator-appmenu.

=== modified file 'scripts/menu-pusher.c'
--- scripts/menu-pusher.c	2010-05-07 10:59:31 +0000
+++ scripts/menu-pusher.c	2010-06-21 21:06:23 +0000
@@ -23,6 +23,7 @@
 #include <dbus/dbus-glib.h>
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-glib/server.h>
+#include <libdbusmenu-gtk/menuitem.h>
 #include "../src/dbus-shared.h"
 #include "../src/application-menu-registrar-client.h"
 
@@ -39,10 +40,12 @@
 
 	DbusmenuMenuitem * secondlevel = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(secondlevel, DBUSMENU_MENUITEM_PROP_LABEL, "Open");
+	dbusmenu_menuitem_property_set_shortcut_string(secondlevel, "<Control>O");
 	dbusmenu_menuitem_child_append(firstlevel, secondlevel);
 
 	secondlevel = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(secondlevel, DBUSMENU_MENUITEM_PROP_LABEL, "Save");
+	dbusmenu_menuitem_property_set_shortcut_string(secondlevel, "<Control>S");
 	dbusmenu_menuitem_child_append(firstlevel, secondlevel);
 
 	secondlevel = dbusmenu_menuitem_new();

=== modified file 'src/window-menus.c'
--- src/window-menus.c	2010-06-21 17:59:20 +0000
+++ src/window-menus.c	2010-06-21 21:06:23 +0000
@@ -203,6 +203,8 @@
 	g_signal_connect(G_OBJECT(priv->props), "destroy", G_CALLBACK(properties_destroyed), newmenu);
 
 	priv->client = dbusmenu_gtkclient_new((gchar *)dbus_addr, (gchar *)dbus_object);
+	GtkAccelGroup * agroup = gtk_accel_group_new();
+	dbusmenu_gtkclient_set_accel_group(priv->client, agroup);
 
 	g_signal_connect(G_OBJECT(priv->client), DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED, G_CALLBACK(root_changed),   newmenu);