From a252fa4375ce61f691d317ee644573d983a42df9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 8 Jun 2010 16:23:31 -0500
Subject: The shortcut strings defined.

---
 libdbusmenu-glib/menuitem.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index b04bba8..77997ba 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -58,6 +58,7 @@ G_BEGIN_DECLS
 #define DBUSMENU_MENUITEM_PROP_ICON_DATA             "icon-data"
 #define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE           "toggle-type"
 #define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE          "toggle-state"
+#define DBUSMENU_MENUITEM_PROP_SHORTCUT              "shortcut"
 
 #define DBUSMENU_MENUITEM_TOGGLE_CHECK               "checkmark"
 #define DBUSMENU_MENUITEM_TOGGLE_RADIO               "radio"
@@ -68,6 +69,12 @@ G_BEGIN_DECLS
 
 #define DBUSMENU_MENUITEM_ICON_NAME_BLANK            "blank-icon"
 
+#define DBUSMENU_MENUITEM_SHORTCUT_CONTROL           "Control"
+#define DBUSMENU_MENUITEM_SHORTCUT_ALT               "Alt"
+#define DBUSMENU_MENUITEM_SHORTCUT_SHIFT             "Shift"
+#define DBUSMENU_MENUITEM_SHORTCUT_SUPER             "Super"
+
+
 /**
  * DbusmenuMenuitem:
  * 
-- 
cgit v1.2.3


From 8ec651ef62779668b4919e94a32cd6c7868b7609 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 8 Jun 2010 17:36:57 -0500
Subject: Dummy functions to get and set the shortcut

---
 libdbusmenu-gtk/menuitem.c | 34 ++++++++++++++++++++++++++++++++++
 libdbusmenu-gtk/menuitem.h |  3 +++
 2 files changed, 37 insertions(+)

diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index 23ff311..8b026e6 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -128,3 +128,37 @@ dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar *
 	return icon;
 }
 
+/**
+	dbusmenu_menuitem_property_set_shortcut:
+	@menuitem: The #DbusmenuMenuitem to set the shortcut on
+	@shortcut: String describing the shortcut
+
+	This function takes a GTK shortcut string as defined in
+	#gtk_accellerator_parse and turns that into the information
+	required to send it over DBusmenu.
+
+	Return value: Whether it was successful at setting the property.
+*/
+gboolean
+dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, const gchar * shortcut)
+{
+
+	return FALSE;
+}
+
+/**
+	dbusmenu_menuitem_property_get_shortcut:
+	@menuitem: The #DbusmenuMenuitem to get the shortcut off
+
+	This function gets a GTK shortcut string as defined in
+	#gtk_accellerator_parse from the data that is transferred
+	over DBusmenu.
+
+	Return value: Either the string or #NULL if there is none.
+*/
+gchar *
+dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem)
+{
+
+	return NULL;
+}
diff --git a/libdbusmenu-gtk/menuitem.h b/libdbusmenu-gtk/menuitem.h
index ff458de..aacab42 100644
--- a/libdbusmenu-gtk/menuitem.h
+++ b/libdbusmenu-gtk/menuitem.h
@@ -36,4 +36,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 gboolean dbusmenu_menuitem_property_set_image (DbusmenuMenuitem * menuitem, const gchar * property, const GdkPixbuf * data);
 GdkPixbuf * dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar * property);
 
+gboolean dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, const gchar * shortcut);
+gchar * dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem);
+
 #endif
-- 
cgit v1.2.3


From 9c4988079766e6c5398852b8b7f78188b6aee369 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 9 Jun 2010 16:52:24 -0500
Subject: Fleshing out building the shortcut array.

---
 libdbusmenu-gtk/menuitem.c | 48 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index 8b026e6..1ae4817 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -27,6 +27,8 @@ License version 3 and version 2.1 along with this program.  If not, see
 */
 
 #include "menuitem.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 /**
 	dbusmenu_menuitem_property_set_image:
@@ -134,7 +136,7 @@ dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar *
 	@shortcut: String describing the shortcut
 
 	This function takes a GTK shortcut string as defined in
-	#gtk_accellerator_parse and turns that into the information
+	#gtk_accelerator_parse and turns that into the information
 	required to send it over DBusmenu.
 
 	Return value: Whether it was successful at setting the property.
@@ -142,8 +144,47 @@ dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar *
 gboolean
 dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, const gchar * shortcut)
 {
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(menuitem), FALSE);
+	g_return_val_if_fail(shortcut != NULL, FALSE);
+
+	guint key = 0;
+	GdkModifierType modifier = 0;
+
+	gtk_accelerator_parse(shortcut, &key, &modifier);
 
-	return FALSE;
+	if (key == 0) {
+		g_warning("Unable to parse shortcut string '%s'", shortcut);
+		return FALSE;
+	}
+
+	GPtrArray * array = g_ptr_array_new();
+
+	if (modifier & GDK_CONTROL_MASK) {
+		g_ptr_array_add(array, g_strdup(DBUSMENU_MENUITEM_SHORTCUT_CONTROL));
+	}
+	if (modifier & GDK_MOD1_MASK) {
+		g_ptr_array_add(array, g_strdup(DBUSMENU_MENUITEM_SHORTCUT_ALT));
+	}
+	if (modifier & GDK_SHIFT_MASK) {
+		g_ptr_array_add(array, g_strdup(DBUSMENU_MENUITEM_SHORTCUT_SHIFT));
+	}
+	if (modifier & GDK_SUPER_MASK) {
+		g_ptr_array_add(array, g_strdup(DBUSMENU_MENUITEM_SHORTCUT_SUPER));
+	}
+
+	gint len = g_utf8_strlen(shortcut, -1);
+	g_ptr_array_add(array, g_strdup(shortcut + len - 1));
+
+	GPtrArray * wrapper = g_ptr_array_new();
+	g_ptr_array_add(wrapper, array);
+
+	GValue value = {0};
+	g_value_init(&value, G_TYPE_BOXED);
+	g_value_set_boxed(&value, wrapper);
+
+	dbusmenu_menuitem_property_set_value(menuitem, DBUSMENU_MENUITEM_PROP_SHORTCUT, &value);
+
+	return TRUE;
 }
 
 /**
@@ -151,7 +192,7 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, const gcha
 	@menuitem: The #DbusmenuMenuitem to get the shortcut off
 
 	This function gets a GTK shortcut string as defined in
-	#gtk_accellerator_parse from the data that is transferred
+	#gtk_accelerator_parse from the data that is transferred
 	over DBusmenu.
 
 	Return value: Either the string or #NULL if there is none.
@@ -159,6 +200,7 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, const gcha
 gchar *
 dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem)
 {
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(menuitem), FALSE);
 
 	return NULL;
 }
-- 
cgit v1.2.3


From 2c464b6b4c16d4dc32090706ecfc7c198d68c84e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 9 Jun 2010 20:39:21 -0500
Subject: Switching things around to expose the key and modifier more as it's
 more useful.

---
 libdbusmenu-gtk/menuitem.c | 30 ++++++++++++++++++------------
 libdbusmenu-gtk/menuitem.h |  6 ++++--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index 1ae4817..0f09483 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -142,7 +142,7 @@ dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar *
 	Return value: Whether it was successful at setting the property.
 */
 gboolean
-dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, const gchar * shortcut)
+dbusmenu_menuitem_property_set_shortcut_string (DbusmenuMenuitem * menuitem, const gchar * shortcut)
 {
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(menuitem), FALSE);
 	g_return_val_if_fail(shortcut != NULL, FALSE);
@@ -157,6 +157,14 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, const gcha
 		return FALSE;
 	}
 
+	return dbusmenu_menuitem_property_set_shortcut(menuitem, key, modifier);
+}
+
+gboolean
+dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key, GdkModifierType modifier)
+{
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(menuitem), FALSE);
+
 	GPtrArray * array = g_ptr_array_new();
 
 	if (modifier & GDK_CONTROL_MASK) {
@@ -172,8 +180,7 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, const gcha
 		g_ptr_array_add(array, g_strdup(DBUSMENU_MENUITEM_SHORTCUT_SUPER));
 	}
 
-	gint len = g_utf8_strlen(shortcut, -1);
-	g_ptr_array_add(array, g_strdup(shortcut + len - 1));
+	g_ptr_array_add(array, g_strdup(gdk_keyval_name(key)));
 
 	GPtrArray * wrapper = g_ptr_array_new();
 	g_ptr_array_add(wrapper, array);
@@ -190,17 +197,16 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, const gcha
 /**
 	dbusmenu_menuitem_property_get_shortcut:
 	@menuitem: The #DbusmenuMenuitem to get the shortcut off
+	@key: Location to put the key value
+	@modifier: Location to put the modifier mask
 
-	This function gets a GTK shortcut string as defined in
-	#gtk_accelerator_parse from the data that is transferred
-	over DBusmenu.
-
-	Return value: Either the string or #NULL if there is none.
+	This function gets a GTK shortcut as a key and a mask
+	for use to set the accelerators.
 */
-gchar *
-dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem)
+void
+dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * key, GdkModifierType * modifier)
 {
-	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(menuitem), FALSE);
+	g_return_if_fail(DBUSMENU_IS_MENUITEM(menuitem));
 
-	return NULL;
+	return;
 }
diff --git a/libdbusmenu-gtk/menuitem.h b/libdbusmenu-gtk/menuitem.h
index aacab42..ba01549 100644
--- a/libdbusmenu-gtk/menuitem.h
+++ b/libdbusmenu-gtk/menuitem.h
@@ -32,11 +32,13 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libdbusmenu-glib/menuitem.h>
+#include <gdk/gdk.h>
 
 gboolean dbusmenu_menuitem_property_set_image (DbusmenuMenuitem * menuitem, const gchar * property, const GdkPixbuf * data);
 GdkPixbuf * dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar * property);
 
-gboolean dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, const gchar * shortcut);
-gchar * dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem);
+gboolean dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key, GdkModifierType modifier);
+gboolean dbusmenu_menuitem_property_set_shortcut_string (DbusmenuMenuitem * menuitem, const gchar * shortcut);
+void dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * key, GdkModifierType * modifiers);
 
 #endif
-- 
cgit v1.2.3


From 47d48f8c3eb464e27f9632f51ce574fc9358143b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Jun 2010 15:17:26 -0500
Subject: Trying a dummy sgml file

---
 docs/libdbusmenu-glib/reference/Makefile.am     | 2 +-
 docs/libdbusmenu-glib/reference/tmpl/dummy.sgml | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 docs/libdbusmenu-glib/reference/tmpl/dummy.sgml

diff --git a/docs/libdbusmenu-glib/reference/Makefile.am b/docs/libdbusmenu-glib/reference/Makefile.am
index e8a3610..8119537 100644
--- a/docs/libdbusmenu-glib/reference/Makefile.am
+++ b/docs/libdbusmenu-glib/reference/Makefile.am
@@ -80,7 +80,7 @@ include $(top_srcdir)/gtk-doc.local.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in tmpl/dummy.sgml
 
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
diff --git a/docs/libdbusmenu-glib/reference/tmpl/dummy.sgml b/docs/libdbusmenu-glib/reference/tmpl/dummy.sgml
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.2.3


From d6970de44f5ce5e6572761bc68d4252061794c9d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Jun 2010 15:20:24 -0500
Subject: Apparently you can't use EXTRA_DIST like this with gtk-doc.  Why be
 normal?

---
 docs/libdbusmenu-glib/reference/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/libdbusmenu-glib/reference/Makefile.am b/docs/libdbusmenu-glib/reference/Makefile.am
index 8119537..e8a3610 100644
--- a/docs/libdbusmenu-glib/reference/Makefile.am
+++ b/docs/libdbusmenu-glib/reference/Makefile.am
@@ -80,7 +80,7 @@ include $(top_srcdir)/gtk-doc.local.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in tmpl/dummy.sgml
+EXTRA_DIST += version.xml.in
 
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
-- 
cgit v1.2.3


From 327143819733e9104a6f9b6ee043289d09a5fae5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Jun 2010 20:19:34 -0500
Subject: Adding a dummy sgml file.

---
 docs/libdbusmenu-gtk/reference/tmpl/dummy.sgml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/libdbusmenu-gtk/reference/tmpl/dummy.sgml

diff --git a/docs/libdbusmenu-gtk/reference/tmpl/dummy.sgml b/docs/libdbusmenu-gtk/reference/tmpl/dummy.sgml
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.2.3


From 4fbdf12b5671ebcc68ce2d41018cd2a567298be8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 10 Jun 2010 21:11:45 -0500
Subject: Adding an extra callback to catch a race condition

---
 libdbusmenu-glib/client.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index c0d3b7a..fa233a4 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -30,6 +30,8 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include "config.h"
 #endif
 
+#include <dbus/dbus-glib-bindings.h>
+
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
@@ -397,6 +399,25 @@ dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, c
 	return build_proxies(client);
 }
 
+/* This is the response to see if the name has an owner.  If
+   it does, then we should build the proxies here.  Race condition
+   check. */
+static void
+name_owner_check (DBusGProxy *proxy, gboolean has_owner, GError *error, gpointer userdata)
+{
+	if (error != NULL) {
+		return;
+	}
+
+	if (!has_owner) {
+		return;
+	}
+
+	DbusmenuClient * client = DBUSMENU_CLIENT(userdata);
+	build_proxies(client);
+	return;
+}
+
 /* This function builds the DBus proxy which will look out for
    the service coming up. */
 static void
@@ -426,6 +447,13 @@ build_dbus_proxy (DbusmenuClient * client)
 	dbus_g_proxy_connect_signal(priv->dbusproxy, "NameOwnerChanged",
 	                            G_CALLBACK(dbus_owner_change), client, NULL);
 
+	/* Now let's check to make sure we're not in some race
+	   condition case. */
+	org_freedesktop_DBus_name_has_owner_async(priv->dbusproxy,
+	                                          priv->dbus_name,
+	                                          name_owner_check,
+	                                          client);
+
 	return;
 }
 
-- 
cgit v1.2.3


From 77958c0a4c45138e5f731e6f11cdee5a8bc3f8a8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 10:58:21 -0500
Subject: Adding in a prototype for stealing the shortcut off of a menuitem.

---
 libdbusmenu-gtk/menuitem.c | 7 +++++++
 libdbusmenu-gtk/menuitem.h | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index 0f09483..74cb635 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -194,6 +194,13 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key,
 	return TRUE;
 }
 
+gboolean
+dbusmenu_menuitem_property_set_shortcut_menuitem (DbusmenuMenuitem * menuitem, const GtkMenuItem * gmi)
+{
+
+	return FALSE;
+}
+
 /**
 	dbusmenu_menuitem_property_get_shortcut:
 	@menuitem: The #DbusmenuMenuitem to get the shortcut off
diff --git a/libdbusmenu-gtk/menuitem.h b/libdbusmenu-gtk/menuitem.h
index ba01549..6960f76 100644
--- a/libdbusmenu-gtk/menuitem.h
+++ b/libdbusmenu-gtk/menuitem.h
@@ -33,12 +33,14 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libdbusmenu-glib/menuitem.h>
 #include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 gboolean dbusmenu_menuitem_property_set_image (DbusmenuMenuitem * menuitem, const gchar * property, const GdkPixbuf * data);
 GdkPixbuf * dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar * property);
 
 gboolean dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key, GdkModifierType modifier);
 gboolean dbusmenu_menuitem_property_set_shortcut_string (DbusmenuMenuitem * menuitem, const gchar * shortcut);
+gboolean dbusmenu_menuitem_property_set_shortcut_menuitem (DbusmenuMenuitem * menuitem, const GtkMenuItem * gmi);
 void dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * key, GdkModifierType * modifiers);
 
 #endif
-- 
cgit v1.2.3


From 50dcdae3889fef7da43c6618b35b70847ba59d72 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 11:05:34 -0500
Subject: Comment fixes

---
 libdbusmenu-gtk/menuitem.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index 74cb635..6f5c6b3 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -131,7 +131,7 @@ dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar *
 }
 
 /**
-	dbusmenu_menuitem_property_set_shortcut:
+	dbusmenu_menuitem_property_set_shortcut_string:
 	@menuitem: The #DbusmenuMenuitem to set the shortcut on
 	@shortcut: String describing the shortcut
 
@@ -160,6 +160,17 @@ dbusmenu_menuitem_property_set_shortcut_string (DbusmenuMenuitem * menuitem, con
 	return dbusmenu_menuitem_property_set_shortcut(menuitem, key, modifier);
 }
 
+/**
+	dbusmenu_menuitem_property_set_shortcut:
+	@menuitem: The #DbusmenuMenuitem to set the shortcut on
+	@key: The keycode of the key to send
+	@modifier: A bitmask of modifiers used to activate the item
+
+	Takes the modifer described by @key and @modifier and places that into
+	the format sending across Dbus for shortcuts.
+
+	Return value: Whether it was successful at setting the property.
+*/
 gboolean
 dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key, GdkModifierType modifier)
 {
@@ -194,6 +205,17 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key,
 	return TRUE;
 }
 
+/**
+	dbusmenu_menuitem_property_set_shortcut_menuitem:
+	@menuitem: The #DbusmenuMenuitem to set the shortcut on
+	@gmi: A menu item to steal the shortcut off of
+
+	Takes the shortcut that is installed on a menu item and calls
+	#dbusmenu_menuitem_property_set_shortcut with it.  It also sets
+	up listeners to watch it change.
+
+	Return value: Whether it was successful at setting the property.
+*/
 gboolean
 dbusmenu_menuitem_property_set_shortcut_menuitem (DbusmenuMenuitem * menuitem, const GtkMenuItem * gmi)
 {
-- 
cgit v1.2.3


From 7fc24062ed7fea97fec2a3cd873dcc68edc9c488 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 12:12:35 -0500
Subject: Fleshing out getting the accelerator from the menuitem.

---
 libdbusmenu-gtk/menuitem.c | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index 6f5c6b3..dfd83b0 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -205,6 +205,14 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key,
 	return TRUE;
 }
 
+/* Look at the closures in an accel group and find
+   the one that matches the one we've been passed */
+static gboolean
+find_closure (GtkAccelKey * key, GClosure * closure, gpointer user_data)
+{
+	return closure == user_data;
+}
+
 /**
 	dbusmenu_menuitem_property_set_shortcut_menuitem:
 	@menuitem: The #DbusmenuMenuitem to set the shortcut on
@@ -219,8 +227,32 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key,
 gboolean
 dbusmenu_menuitem_property_set_shortcut_menuitem (DbusmenuMenuitem * menuitem, const GtkMenuItem * gmi)
 {
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(menuitem), FALSE);
+	g_return_val_if_fail(GTK_IS_MENU_ITEM(gmi), FALSE);
+
+	GClosure * closure = NULL;
+	GList * clist;
+
+	clist = gtk_widget_list_accel_closures(GTK_WIDGET(gmi));
+	if (clist == NULL) {
+		g_warning("Menuitem does not have any closures.");
+		return FALSE;
+	}
+
+	closure = (GClosure *)clist->data;
+	g_list_free(clist);
+
+	GtkAccelGroup * group = gtk_accel_group_from_accel_closure(closure);
+	
+	/* Seriously, if this returns NULL something is seriously
+	   wrong in GTK. */
+	g_return_val_if_fail(group != NULL, FALSE);
+
+	GtkAccelKey * key = gtk_accel_group_find(group, find_closure, closure);
+	/* Again, not much we can do except complain loudly. */
+	g_return_val_if_fail(key != NULL, FALSE);
 
-	return FALSE;
+	return dbusmenu_menuitem_property_set_shortcut(menuitem, key->accel_key, key->accel_mods);
 }
 
 /**
-- 
cgit v1.2.3


From b0099f8f5ce53544a225033274ffd692e9edf4e6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 12:44:03 -0500
Subject: Checking the validity of the key combo.

---
 libdbusmenu-gtk/menuitem.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index dfd83b0..ea1b77f 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -175,6 +175,7 @@ gboolean
 dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key, GdkModifierType modifier)
 {
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(menuitem), FALSE);
+	g_return_val_if_fail(gtk_accelerator_valid(key, modifier), FALSE);
 
 	GPtrArray * array = g_ptr_array_new();
 
-- 
cgit v1.2.3


From b29f86be192fda821b7245b6159fa1aefc623a40 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 13:10:18 -0500
Subject: Adding in a new gtester test suite.

---
 .bzrignore               |  3 +++
 tests/Makefile.am        | 32 ++++++++++++++++++++++-
 tests/test-gtk-objects.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 tests/test-gtk-objects.c

diff --git a/.bzrignore b/.bzrignore
index 37f2bb8..02b481f 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -71,3 +71,6 @@ libdbusmenu-gtk/DbusmenuGtk-0.2.gir
 libdbusmenu-gtk/DbusmenuGtk-0.2.tmp.gir
 libdbusmenu-gtk/DbusmenuGtk-0.2.typelib
 libdbusmenu-gtk/DbusmenuGtk-0.2.vapi
+tests/test-gtk-objects
+tests/test-gtk-objects-test
+tests/test-gtk-objects.xml
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cfa1399..6482d09 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,6 +7,7 @@ TESTS = \
 	test-glib-properties \
 	test-glib-proxy \
 	test-glib-simple-items \
+	test-gtk-objects-test \
 	test-gtk-label \
 	test-gtk-reorder
 
@@ -20,6 +21,7 @@ check_PROGRAMS = \
 	test-glib-proxy-client \
 	test-glib-proxy-server \
 	test-glib-proxy-proxy \
+	test-gtk-objects \
 	test-gtk-label-client \
 	test-gtk-label-server \
 	test-glib-simple-items \
@@ -196,6 +198,33 @@ test_glib_simple_items_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	$(DBUSMENUGLIB_LIBS)
 
+######################
+# Test GTK Object
+######################
+
+GTK_OBJECT_XML_REPORT = test-gtk-objects.xml
+
+test-gtk-objects-test: test-gtk-objects Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo $(XVFB_RUN) >> $@
+	@echo $(DBUS_RUNNER) --task gtester --parameter --verbose --parameter -k --parameter -o --parameter $(GTK_OBJECT_XML_REPORT) --parameter ./test-gtk-objects >> $@
+	@chmod +x $@
+
+test_gtk_objects_SOURCES = \
+	test-gtk-objects.c
+
+test_gtk_objects_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGLIB_CFLAGS) \
+	$(DBUSMENUGTK_CFLAGS) \
+	-Wall -Werror
+
+test_gtk_objects_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	$(DBUSMENUGLIB_LIBS) \
+	$(DBUSMENUGTK_LIBS)
+
 #########################
 # Test GTK Label
 #########################
@@ -322,5 +351,6 @@ distclean-local:
 
 DISTCLEANFILES = \
 	$(TESTS) \
-	$(OBJECT_XML_REPORT)
+	$(OBJECT_XML_REPORT) \
+	$(GTK_OBJECT_XML_REPORT)
 
diff --git a/tests/test-gtk-objects.c b/tests/test-gtk-objects.c
new file mode 100644
index 0000000..561f91e
--- /dev/null
+++ b/tests/test-gtk-objects.c
@@ -0,0 +1,67 @@
+/*
+Testing for the various objects just by themselves.
+
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <libdbusmenu-glib/menuitem.h>
+#include <libdbusmenu-gtk/menuitem.h>
+
+/* Building the basic menu item, make sure we didn't break
+   any core GObject stuff */
+static void
+test_object_menuitem (void)
+{
+	/* Build a menu item */
+	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
+
+	/* Test to make sure it's a happy object */
+	g_assert(item != NULL);
+	g_assert(G_IS_OBJECT(item));
+	g_assert(DBUSMENU_IS_MENUITEM(item));
+
+	/* Set up a check to make sure it gets destroyed on unref */
+	g_object_add_weak_pointer(G_OBJECT(item), (gpointer *)&item);
+	g_object_unref(item);
+
+	/* Did it go away? */
+	g_assert(item == NULL);
+
+	return;
+}
+
+/* Build the test suite */
+static void
+test_gtk_objects_suite (void)
+{
+	g_test_add_func ("/dbusmenu/gtk/objects/menuitem/base",          test_object_menuitem);
+	return;
+}
+
+gint
+main (gint argc, gchar * argv[])
+{
+	gtk_init(&argc, &argv);
+
+	g_test_init(&argc, &argv, NULL);
+
+	/* Test suites */
+	test_gtk_objects_suite();
+
+	return g_test_run ();
+}
-- 
cgit v1.2.3


From c78d1b4b827e13ee4e498516e14a56571e8a8b5f Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 13:29:49 -0500
Subject: Adding a test image

---
 tests/test-gtk-objects.jpg | Bin 0 -> 14376 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/test-gtk-objects.jpg

diff --git a/tests/test-gtk-objects.jpg b/tests/test-gtk-objects.jpg
new file mode 100644
index 0000000..478704e
Binary files /dev/null and b/tests/test-gtk-objects.jpg differ
-- 
cgit v1.2.3


From ecf64a2f000ee9666a263afe23075d36bf2efe9a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 13:54:12 -0500
Subject: Adding in a test for the pixbuf property

---
 tests/Makefile.am        |  1 +
 tests/test-gtk-objects.c | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6482d09..b21c346 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -217,6 +217,7 @@ test_gtk_objects_CFLAGS = \
 	-I $(srcdir)/.. \
 	$(DBUSMENUGLIB_CFLAGS) \
 	$(DBUSMENUGTK_CFLAGS) \
+	-DSRCDIR="\"$(srcdir)\"" \
 	-Wall -Werror
 
 test_gtk_objects_LDADD = \
diff --git a/tests/test-gtk-objects.c b/tests/test-gtk-objects.c
index 561f91e..c9f9c4c 100644
--- a/tests/test-gtk-objects.c
+++ b/tests/test-gtk-objects.c
@@ -22,6 +22,8 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-gtk/menuitem.h>
 
+#define TEST_IMAGE  SRCDIR "/" "test-gtk-objects.jpg"
+
 /* Building the basic menu item, make sure we didn't break
    any core GObject stuff */
 static void
@@ -45,11 +47,49 @@ test_object_menuitem (void)
 	return;
 }
 
+/* Setting and getting a pixbuf */
+static void
+test_object_prop_pixbuf (void)
+{
+	const gchar * prop_name = "image-test";
+
+	/* Build a menu item */
+	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
+
+	/* Test to make sure it's a happy object */
+	g_assert(item != NULL);
+	g_assert(G_IS_OBJECT(item));
+	g_assert(DBUSMENU_IS_MENUITEM(item));
+
+	/* Load our image */
+	GdkPixbuf * pixbuf = gdk_pixbuf_new_from_file(TEST_IMAGE, NULL);
+	g_assert(pixbuf != NULL);
+
+	/* Set the property */
+	gboolean success = dbusmenu_menuitem_property_set_image(item, prop_name, pixbuf);
+	g_assert(success);
+	g_object_unref(pixbuf);
+
+	/* Check to see if it's set */
+	const GValue * val = dbusmenu_menuitem_property_get_value(item, prop_name);
+	g_assert(val != NULL);
+
+	/* Get the pixbuf back! */
+	GdkPixbuf * newpixbuf = dbusmenu_menuitem_property_get_image(item, prop_name);
+	g_assert(newpixbuf != NULL);
+	g_object_unref(newpixbuf);
+
+	g_object_unref(item);
+
+	return;
+}
+
 /* Build the test suite */
 static void
 test_gtk_objects_suite (void)
 {
 	g_test_add_func ("/dbusmenu/gtk/objects/menuitem/base",          test_object_menuitem);
+	g_test_add_func ("/dbusmenu/gtk/objects/menuitem/prop_pixbuf",   test_object_prop_pixbuf);
 	return;
 }
 
-- 
cgit v1.2.3


From 13fd7c6e7182b3142c6951098dcd2172c9ddf4ca Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 14:09:09 -0500
Subject: Add a test to set the shortcut on a menuitem

---
 tests/test-gtk-objects.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tests/test-gtk-objects.c b/tests/test-gtk-objects.c
index c9f9c4c..92f2469 100644
--- a/tests/test-gtk-objects.c
+++ b/tests/test-gtk-objects.c
@@ -21,6 +21,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <libdbusmenu-glib/menuitem.h>
 #include <libdbusmenu-gtk/menuitem.h>
+#include <gdk/gdkkeysyms.h>
 
 #define TEST_IMAGE  SRCDIR "/" "test-gtk-objects.jpg"
 
@@ -84,12 +85,41 @@ test_object_prop_pixbuf (void)
 	return;
 }
 
+/* Setting and getting a shortcut */
+static void
+test_object_prop_shortcut (void)
+{
+	/* Build a menu item */
+	DbusmenuMenuitem * item = dbusmenu_menuitem_new();
+
+	/* Test to make sure it's a happy object */
+	g_assert(item != NULL);
+	g_assert(G_IS_OBJECT(item));
+	g_assert(DBUSMENU_IS_MENUITEM(item));
+
+	guint key = GDK_c;
+	GdkModifierType modifier = GDK_CONTROL_MASK;
+
+	/* Set a shortcut */
+	gboolean success = dbusmenu_menuitem_property_set_shortcut(item, key, modifier);
+	g_assert(success);
+
+	/* Check for value */
+	const GValue * val = dbusmenu_menuitem_property_get_value(item, DBUSMENU_MENUITEM_PROP_SHORTCUT);
+	g_assert(val != NULL);
+
+	g_object_unref(item);
+
+	return;
+}
+
 /* Build the test suite */
 static void
 test_gtk_objects_suite (void)
 {
 	g_test_add_func ("/dbusmenu/gtk/objects/menuitem/base",          test_object_menuitem);
 	g_test_add_func ("/dbusmenu/gtk/objects/menuitem/prop_pixbuf",   test_object_prop_pixbuf);
+	g_test_add_func ("/dbusmenu/gtk/objects/menuitem/prop_shortcut", test_object_prop_shortcut);
 	return;
 }
 
-- 
cgit v1.2.3


From 01b4ed50a28d5e340462b5371802006260519a11 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 14:20:34 -0500
Subject: Putting more sensible names in the gtester output

---
 tests/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index b21c346..d608860 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -86,7 +86,7 @@ OBJECT_XML_REPORT = test-glib-objects.xml
 
 test-glib-objects-test: test-glib-objects Makefile.am
 	@echo "#!/bin/bash" > $@
-	@echo $(DBUS_RUNNER) --task gtester --parameter --verbose --parameter -k --parameter -o --parameter $(OBJECT_XML_REPORT) --parameter ./test-glib-objects >> $@
+	@echo $(DBUS_RUNNER) --task gtester --task-name test --parameter --verbose --parameter -k --parameter -o --parameter $(OBJECT_XML_REPORT) --parameter ./test-glib-objects >> $@
 	@chmod +x $@
 
 test_glib_objects_SOURCES = \
@@ -207,7 +207,7 @@ GTK_OBJECT_XML_REPORT = test-gtk-objects.xml
 test-gtk-objects-test: test-gtk-objects Makefile.am
 	@echo "#!/bin/bash" > $@
 	@echo $(XVFB_RUN) >> $@
-	@echo $(DBUS_RUNNER) --task gtester --parameter --verbose --parameter -k --parameter -o --parameter $(GTK_OBJECT_XML_REPORT) --parameter ./test-gtk-objects >> $@
+	@echo $(DBUS_RUNNER) --task gtester --task-name test --parameter --verbose --parameter -k --parameter -o --parameter $(GTK_OBJECT_XML_REPORT) --parameter ./test-gtk-objects >> $@
 	@chmod +x $@
 
 test_gtk_objects_SOURCES = \
-- 
cgit v1.2.3


From 4ead60b99de627e29d0aae213c622ba10ef72069 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 14:20:52 -0500
Subject: initing the value array properly

---
 libdbusmenu-gtk/menuitem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index ea1b77f..a4818ca 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -198,7 +198,7 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key,
 	g_ptr_array_add(wrapper, array);
 
 	GValue value = {0};
-	g_value_init(&value, G_TYPE_BOXED);
+	g_value_init(&value, G_TYPE_PTR_ARRAY);
 	g_value_set_boxed(&value, wrapper);
 
 	dbusmenu_menuitem_property_set_value(menuitem, DBUSMENU_MENUITEM_PROP_SHORTCUT, &value);
-- 
cgit v1.2.3


From 16b5a01c2cb8c4d8ce6216f984c4a06f6aa14c3a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 14:50:16 -0500
Subject: Fleshing out getting the shortcut

---
 libdbusmenu-gtk/menuitem.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index a4818ca..f56e9e5 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -268,7 +268,58 @@ dbusmenu_menuitem_property_set_shortcut_menuitem (DbusmenuMenuitem * menuitem, c
 void
 dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * key, GdkModifierType * modifier)
 {
+	*key = 0;
+	*modifier = 0;
+
 	g_return_if_fail(DBUSMENU_IS_MENUITEM(menuitem));
 
+	const GValue * wrapper = dbusmenu_menuitem_property_get_value(menuitem, DBUSMENU_MENUITEM_PROP_SHORTCUT);
+	if (wrapper == NULL) {
+		return;
+	}
+
+	g_return_if_fail(G_VALUE_HOLDS_BOXED(wrapper));
+
+	GPtrArray * wrapperarray = (GPtrArray *)g_value_get_boxed(wrapper);
+	if (wrapperarray->len == 0) {
+		return;
+	}
+
+	if (wrapperarray->len != 1) {
+		g_warning("Shortcut is more than one entry.  Which we don't currently support.  Taking the first.");
+	}
+
+	GPtrArray * entryarray = g_ptr_array_index(wrapperarray, 0);
+	if (entryarray->len == 0) {
+		/* Seems a little odd, but really, we're saying that it isn't a
+		   shortcut, so I'm comfortable with exiting silently. */
+		return;
+	}
+
+	/* Parse through modifiers */
+	int i;
+	for (i = 0; i < entryarray->len - 1; i++) {
+		if (g_strcmp0(g_ptr_array_index(entryarray, i), DBUSMENU_MENUITEM_SHORTCUT_CONTROL) == 0) {
+			*modifier |= GDK_CONTROL_MASK;
+			continue;
+		}
+		if (g_strcmp0(g_ptr_array_index(entryarray, i), DBUSMENU_MENUITEM_SHORTCUT_ALT) == 0) {
+			*modifier |= GDK_MOD1_MASK;
+			continue;
+		}
+		if (g_strcmp0(g_ptr_array_index(entryarray, i), DBUSMENU_MENUITEM_SHORTCUT_SHIFT) == 0) {
+			*modifier |= GDK_SHIFT_MASK;
+			continue;
+		}
+		if (g_strcmp0(g_ptr_array_index(entryarray, i), DBUSMENU_MENUITEM_SHORTCUT_SUPER) == 0) {
+			*modifier |= GDK_SUPER_MASK;
+			continue;
+		}
+	}
+
+	GdkModifierType tempmod;
+
+	gtk_accelerator_parse(g_ptr_array_index(entryarray, entryarray->len - 1), key, &tempmod);
+
 	return;
 }
-- 
cgit v1.2.3


From ac0a5299c1fe73acb30f34939dfcd6af57c12231 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 14:52:26 -0500
Subject: Testing we can get the modifier back out.

---
 tests/test-gtk-objects.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/test-gtk-objects.c b/tests/test-gtk-objects.c
index 92f2469..726f404 100644
--- a/tests/test-gtk-objects.c
+++ b/tests/test-gtk-objects.c
@@ -108,6 +108,14 @@ test_object_prop_shortcut (void)
 	const GValue * val = dbusmenu_menuitem_property_get_value(item, DBUSMENU_MENUITEM_PROP_SHORTCUT);
 	g_assert(val != NULL);
 
+	/* Check to see if we love it */
+	guint newkey = 0;
+	GdkModifierType newmodifier = 0;
+	dbusmenu_menuitem_property_get_shortcut(item, &newkey, &newmodifier);
+
+	g_assert(key == newkey);
+	g_assert(newmodifier == modifier);
+
 	g_object_unref(item);
 
 	return;
-- 
cgit v1.2.3


From 53e80ec1652a9519a7e546d7055527eb7b5ad2aa Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 15:00:57 -0500
Subject: Sending the test image along with the other data.

---
 tests/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d608860..00297bd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -324,6 +324,7 @@ EXTRA_DIST = \
 	$(examples_DATA) \
 	run-xvfb.sh \
 	$(json_DATA) \
+	test-gtk-objects.jpg \
 	dbusmenu-gtk/dbusMenuTest \
 	dbusmenu-gtk/mago_tests/dbusmenu.xml \
 	dbusmenu-gtk/mago_tests/dbusmenu.py \
-- 
cgit v1.2.3


From 2525166d72f421e045b21910aa7df2523135d1c9 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 15:23:05 -0500
Subject: Switching to an accel label

---
 libdbusmenu-gtk/genericmenuitem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index 8f40d93..1000c68 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -191,7 +191,7 @@ set_label (GtkMenuItem * menu_item, const gchar * label)
 	   update the one that we already have. */
 	if (labelw == NULL) {
 		/* Build it */
-		labelw = GTK_LABEL(gtk_label_new(label));
+		labelw = GTK_LABEL(gtk_accel_label_new(label));
 		gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
 		gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5);
 		gtk_widget_show(GTK_WIDGET(labelw));
-- 
cgit v1.2.3


From b2be41cd5085e821f5557303592c11a064eef104 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 16:10:54 -0500
Subject: Add two functions for setting and getting the accelerator group.

---
 libdbusmenu-gtk/client.c | 34 ++++++++++++++++++++++++++++++++++
 libdbusmenu-gtk/client.h |  3 +++
 2 files changed, 37 insertions(+)

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index 3bd0af6..64f6a6d 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -99,6 +99,40 @@ dbusmenu_gtkclient_finalize (GObject *object)
 	return;
 }
 
+/**
+	dbusmenu_gtkclient_set_accel_group:
+	@client: To set the group on
+	@agroup: The new acceleration group
+
+	Sets the acceleration group for the menu items with accelerators
+	on this client.
+*/
+void
+dbusmenu_gtkclient_set_accel_group (DbusmenuGtkClient * client, GtkAccelGroup * agroup)
+{
+	g_return_if_fail(DBUSMENU_IS_GTKCLIENT(client));
+	g_return_if_fail(GTK_IS_ACCEL_GROUP(agroup));
+
+	return;
+}
+
+/**
+	dbusmenu_gtkclient_get_accel_group:
+	@client: Client to query for an accelerator group
+
+	Gets the accel group for this client.
+
+	Return value: Either a valid group or #NULL on error or
+		none set.
+*/
+GtkAccelGroup *
+dbusmenu_gtkclient_get_accel_group (DbusmenuGtkClient * client)
+{
+	g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), NULL);
+
+	return NULL;
+}
+
 /* Internal Functions */
 
 static const gchar * data_menuitem = "dbusmenugtk-data-gtkmenuitem";
diff --git a/libdbusmenu-gtk/client.h b/libdbusmenu-gtk/client.h
index 7672bf7..a7c96ee 100644
--- a/libdbusmenu-gtk/client.h
+++ b/libdbusmenu-gtk/client.h
@@ -79,6 +79,9 @@ DbusmenuGtkClient * dbusmenu_gtkclient_new (gchar * dbus_name, gchar * dbus_obje
 GtkMenuItem * dbusmenu_gtkclient_menuitem_get (DbusmenuGtkClient * client, DbusmenuMenuitem * item);
 GtkMenu *     dbusmenu_gtkclient_menuitem_get_submenu (DbusmenuGtkClient * client, DbusmenuMenuitem * item);
 
+void  dbusmenu_gtkclient_set_accel_group (DbusmenuGtkClient * client, GtkAccelGroup * agroup);
+GtkAccelGroup * dbusmenu_gtkclient_get_accel_group (DbusmenuGtkClient * client);
+
 void dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * item, GtkMenuItem * gmi, DbusmenuMenuitem * parent);
 
 /**
-- 
cgit v1.2.3


From b426c6e47fbfa4c701a264c765a47b7fba820e8c Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 16:15:30 -0500
Subject: Adding a private area on to the client.

---
 libdbusmenu-gtk/client.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index 64f6a6d..09e7b4e 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -36,6 +36,15 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include "menuitem.h"
 #include "genericmenuitem.h"
 
+/* Private */
+typedef struct _DbusmenuGtkClientPrivate DbusmenuGtkClientPrivate;
+struct _DbusmenuGtkClientPrivate {
+	GtkAccelGroup * agroup;
+};
+
+#define DBUSMENU_GTKCLIENT_GET_PRIVATE(o) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_GTKCLIENT_TYPE, DbusmenuGtkClientPrivate))
+
 /* Prototypes */
 static void dbusmenu_gtkclient_class_init (DbusmenuGtkClientClass *klass);
 static void dbusmenu_gtkclient_init       (DbusmenuGtkClient *self);
@@ -62,6 +71,8 @@ dbusmenu_gtkclient_class_init (DbusmenuGtkClientClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+	g_type_class_add_private (klass, sizeof (DbusmenuGtkClientPrivate));
+
 	object_class->dispose = dbusmenu_gtkclient_dispose;
 	object_class->finalize = dbusmenu_gtkclient_finalize;
 
@@ -73,6 +84,10 @@ dbusmenu_gtkclient_class_init (DbusmenuGtkClientClass *klass)
 static void
 dbusmenu_gtkclient_init (DbusmenuGtkClient *self)
 {
+	DbusmenuGtkClientPrivate * priv = DBUSMENU_GTKCLIENT_GET_PRIVATE(self);
+
+	priv->agroup = NULL;
+
 	dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(self), DBUSMENU_CLIENT_TYPES_DEFAULT,   new_item_normal);
 	dbusmenu_client_add_type_handler(DBUSMENU_CLIENT(self), DBUSMENU_CLIENT_TYPES_SEPARATOR, new_item_seperator);
 
@@ -85,6 +100,12 @@ dbusmenu_gtkclient_init (DbusmenuGtkClient *self)
 static void
 dbusmenu_gtkclient_dispose (GObject *object)
 {
+	DbusmenuGtkClientPrivate * priv = DBUSMENU_GTKCLIENT_GET_PRIVATE(object);
+
+	if (priv->agroup != NULL) {
+		g_object_unref(priv->agroup);
+		priv->agroup = NULL;
+	}
 
 	G_OBJECT_CLASS (dbusmenu_gtkclient_parent_class)->dispose (object);
 	return;
-- 
cgit v1.2.3


From a27e07f2173dea07625df51466563b1caeddb385 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 17:04:37 -0500
Subject: Fleshing out setting and getting the accel group

---
 libdbusmenu-gtk/client.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index 09e7b4e..ca0b668 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -120,6 +120,48 @@ dbusmenu_gtkclient_finalize (GObject *object)
 	return;
 }
 
+static void
+swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) {
+	gpointer * array = (gpointer *)userdata;
+	DbusmenuGtkClient * client = (DbusmenuGtkClient *)array[0];
+	GtkAccelGroup * old_agroup = (GtkAccelGroup *)array[1];
+	GtkAccelGroup * new_agroup = (GtkAccelGroup *)array[2];
+
+	/* If we don't have a shortcut we don't care */
+	if (!dbusmenu_menuitem_property_exist(mi, DBUSMENU_MENUITEM_PROP_SHORTCUT)) {
+		return;
+	}
+
+	guint key = 0;
+	GdkModifierType modifiers = 0;
+
+	dbusmenu_menuitem_property_get_shortcut(mi, &key, &modifiers);
+	
+	if (key == 0) {
+		return;
+	}
+
+	GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(client, mi);
+	if (gmi == NULL) {
+		return;
+	}
+
+	if (old_agroup != NULL) {
+		gtk_widget_remove_accelerator(GTK_WIDGET(gmi), old_agroup, key, modifiers);
+	}
+
+	if (new_agroup != NULL) {
+		gtk_widget_add_accelerator(GTK_WIDGET(gmi),
+		                           "activate",
+		                           new_agroup,
+		                           key,
+		                           modifiers,
+		                           GTK_ACCEL_VISIBLE);
+	}
+
+	return;
+}
+
 /**
 	dbusmenu_gtkclient_set_accel_group:
 	@client: To set the group on
@@ -134,6 +176,23 @@ dbusmenu_gtkclient_set_accel_group (DbusmenuGtkClient * client, GtkAccelGroup *
 	g_return_if_fail(DBUSMENU_IS_GTKCLIENT(client));
 	g_return_if_fail(GTK_IS_ACCEL_GROUP(agroup));
 
+	DbusmenuGtkClientPrivate * priv = DBUSMENU_GTKCLIENT_GET_PRIVATE(client);
+
+	DbusmenuMenuitem * root = dbusmenu_client_get_root(DBUSMENU_CLIENT(client));
+	if (root != NULL) {
+		gpointer data[3];
+		data[0] = client;
+		data[1] = priv->agroup;
+		data[2] = agroup;
+
+		dbusmenu_menuitem_foreach(root, swap_agroup, data);
+	}
+
+	if (priv->agroup != NULL) {
+		g_object_unref(priv->agroup);
+		priv->agroup = NULL;
+	}
+
 	return;
 }
 
@@ -151,7 +210,9 @@ dbusmenu_gtkclient_get_accel_group (DbusmenuGtkClient * client)
 {
 	g_return_val_if_fail(DBUSMENU_IS_GTKCLIENT(client), NULL);
 
-	return NULL;
+	DbusmenuGtkClientPrivate * priv = DBUSMENU_GTKCLIENT_GET_PRIVATE(client);
+
+	return priv->agroup;
 }
 
 /* Internal Functions */
-- 
cgit v1.2.3


From be82ae8c060f84b28d4e4c6fb0c4b11062112984 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 17:09:02 -0500
Subject: Restructuring to use a structure to get cleaner type checking.

---
 libdbusmenu-gtk/client.c | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index ca0b668..f5d683c 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -120,12 +120,19 @@ dbusmenu_gtkclient_finalize (GObject *object)
 	return;
 }
 
+/* Structure for passing data to swap_agroup */
+typedef struct _swap_agroup_t swap_agroup_t;
+struct _swap_agroup_t {
+	DbusmenuGtkClient * client;
+	GtkAccelGroup * old_agroup;
+	GtkAccelGroup * new_agroup;
+};
+
+/* Looks at the old version of the accelerator group and
+   the new one and makes the state proper. */
 static void
 swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) {
-	gpointer * array = (gpointer *)userdata;
-	DbusmenuGtkClient * client = (DbusmenuGtkClient *)array[0];
-	GtkAccelGroup * old_agroup = (GtkAccelGroup *)array[1];
-	GtkAccelGroup * new_agroup = (GtkAccelGroup *)array[2];
+	swap_agroup_t * data = (swap_agroup_t *)userdata;
 
 	/* If we don't have a shortcut we don't care */
 	if (!dbusmenu_menuitem_property_exist(mi, DBUSMENU_MENUITEM_PROP_SHORTCUT)) {
@@ -141,19 +148,19 @@ swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) {
 		return;
 	}
 
-	GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(client, mi);
+	GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(data->client, mi);
 	if (gmi == NULL) {
 		return;
 	}
 
-	if (old_agroup != NULL) {
-		gtk_widget_remove_accelerator(GTK_WIDGET(gmi), old_agroup, key, modifiers);
+	if (data->old_agroup != NULL) {
+		gtk_widget_remove_accelerator(GTK_WIDGET(gmi), data->old_agroup, key, modifiers);
 	}
 
-	if (new_agroup != NULL) {
+	if (data->new_agroup != NULL) {
 		gtk_widget_add_accelerator(GTK_WIDGET(gmi),
 		                           "activate",
-		                           new_agroup,
+		                           data->new_agroup,
 		                           key,
 		                           modifiers,
 		                           GTK_ACCEL_VISIBLE);
@@ -180,12 +187,12 @@ dbusmenu_gtkclient_set_accel_group (DbusmenuGtkClient * client, GtkAccelGroup *
 
 	DbusmenuMenuitem * root = dbusmenu_client_get_root(DBUSMENU_CLIENT(client));
 	if (root != NULL) {
-		gpointer data[3];
-		data[0] = client;
-		data[1] = priv->agroup;
-		data[2] = agroup;
+		swap_agroup_t data;
+		data.client = client;
+		data.old_agroup = priv->agroup;
+		data.new_agroup = agroup;
 
-		dbusmenu_menuitem_foreach(root, swap_agroup, data);
+		dbusmenu_menuitem_foreach(root, swap_agroup, &data);
 	}
 
 	if (priv->agroup != NULL) {
@@ -193,6 +200,8 @@ dbusmenu_gtkclient_set_accel_group (DbusmenuGtkClient * client, GtkAccelGroup *
 		priv->agroup = NULL;
 	}
 
+	priv->agroup = agroup;
+
 	return;
 }
 
-- 
cgit v1.2.3


From 1338ccff53e35cafae1500eb5414514c57af15bf Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 19:59:13 -0500
Subject: Adding a function to refresh the shortcut of a menuitem.

---
 libdbusmenu-gtk/client.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index f5d683c..625c4ba 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -169,6 +169,24 @@ swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) {
 	return;
 }
 
+/* Refresh the shortcut for an entry */
+static void
+refresh_shortcut (DbusmenuGtkClient * client, DbusmenuMenuitem * mi)
+{
+	g_return_if_fail(DBUSMENU_IS_GTKCLIENT(client));
+	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
+
+	DbusmenuGtkClientPrivate * priv = DBUSMENU_GTKCLIENT_GET_PRIVATE(client);
+
+	swap_agroup_t data;
+	data.client = client;
+	data.old_agroup = priv->agroup;
+	data.new_agroup = priv->agroup;
+
+	return swap_agroup(mi, &data);
+}
+
+
 /**
 	dbusmenu_gtkclient_set_accel_group:
 	@client: To set the group on
-- 
cgit v1.2.3


From 85d700350d533fc1989aa7cb6cfe9e973b4db552 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 20:05:19 -0500
Subject: Connecting up the refresh cycles to property changes and creation.

---
 libdbusmenu-gtk/client.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index 625c4ba..ab7f16c 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -368,6 +368,17 @@ menu_prop_change_cb (DbusmenuMenuitem * mi, gchar * prop, GValue * value, GtkMen
 	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, GValue * value, DbusmenuGtkClient * client)
+{
+	if (!g_strcmp0(prop, DBUSMENU_MENUITEM_PROP_SHORTCUT)) {
+		refresh_shortcut(client, mi);
+	}
+	return;
+}
+
 /* Call back that happens when the DbusmenuMenuitem
    is destroyed.  We're making sure to clean up everything
    else down the pipe. */
@@ -434,6 +445,7 @@ 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), gmi);
+	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);
 
@@ -448,6 +460,7 @@ dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem *
 	process_sensitive(item, gmi, dbusmenu_menuitem_property_get_value(item, DBUSMENU_MENUITEM_PROP_ENABLED));
 	process_toggle_type(item, gmi, dbusmenu_menuitem_property_get_value(item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE));
 	process_toggle_state(item, gmi, dbusmenu_menuitem_property_get_value(item, DBUSMENU_MENUITEM_PROP_TOGGLE_STATE));
+	refresh_shortcut(client, item);
 
 	/* Oh, we're a child, let's deal with that */
 	if (parent != NULL) {
-- 
cgit v1.2.3


From d1cf581703855139e5759ed2fd7b3c49157061ad Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 21:04:19 -0500
Subject: Building a shortcut test

---
 .bzrignore                       |  3 ++
 tests/Makefile.am                | 43 +++++++++++++++++
 tests/test-gtk-shortcut-client.c | 75 ++++++++++++++++++++++++++++++
 tests/test-gtk-shortcut-server.c | 99 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 220 insertions(+)
 create mode 100644 tests/test-gtk-shortcut-client.c
 create mode 100644 tests/test-gtk-shortcut-server.c

diff --git a/.bzrignore b/.bzrignore
index 02b481f..0f5b495 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -74,3 +74,6 @@ libdbusmenu-gtk/DbusmenuGtk-0.2.vapi
 tests/test-gtk-objects
 tests/test-gtk-objects-test
 tests/test-gtk-objects.xml
+tests/test-gtk-shortcut
+tests/test-gtk-shortcut-client
+tests/test-gtk-shortcut-server
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 00297bd..356146f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -9,6 +9,7 @@ TESTS = \
 	test-glib-simple-items \
 	test-gtk-objects-test \
 	test-gtk-label \
+	test-gtk-shortcut \
 	test-gtk-reorder
 
 check_PROGRAMS = \
@@ -24,6 +25,8 @@ check_PROGRAMS = \
 	test-gtk-objects \
 	test-gtk-label-client \
 	test-gtk-label-server \
+	test-gtk-shortcut-client \
+	test-gtk-shortcut-server \
 	test-glib-simple-items \
 	test-gtk-reorder-server
 
@@ -266,6 +269,46 @@ test_gtk_label_client_LDADD = \
 	$(DBUSMENUGTK_LIBS) \
 	$(DBUSMENUTESTS_LIBS)
 
+#########################
+# Test GTK Shortcut
+#########################
+
+test-gtk-shortcut: test-gtk-shortcut-client test-gtk-shortcut-server Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo $(XVFB_RUN) >> $@
+	@echo $(DBUS_RUNNER) --task ./test-gtk-shortcut-client --task-name Client --task ./test-gtk-shortcut-server --task-name Server --ignore-return >> $@
+	@chmod +x $@
+
+test_gtk_shortcut_server_SOURCES = \
+	test-gtk-shortcut-server.c
+
+test_gtk_shortcut_server_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGTK_CFLAGS) \
+	$(DBUSMENUTESTS_CFLAGS) \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_gtk_shortcut_server_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	$(DBUSMENUGTK_LIBS) \
+	$(DBUSMENUTESTS_LIBS)
+
+test_gtk_shortcut_client_SOURCES = \
+	test-gtk-shortcut-client.c
+
+test_gtk_shortcut_client_CFLAGS = \
+	-I $(srcdir)/.. \
+	$(DBUSMENUGTK_CFLAGS) \
+	$(DBUSMENUTESTS_CFLAGS) \
+	$(DBUSMENUGLIB_CFLAGS) -Wall -Werror
+
+test_gtk_shortcut_client_LDADD = \
+	../libdbusmenu-glib/libdbusmenu-glib.la \
+	../libdbusmenu-gtk/libdbusmenu-gtk.la \
+	$(DBUSMENUGTK_LIBS) \
+	$(DBUSMENUTESTS_LIBS)
+
 #########################
 # Test GTK Reorder
 #########################
diff --git a/tests/test-gtk-shortcut-client.c b/tests/test-gtk-shortcut-client.c
new file mode 100644
index 0000000..26e1531
--- /dev/null
+++ b/tests/test-gtk-shortcut-client.c
@@ -0,0 +1,75 @@
+/*
+A test for libdbusmenu to ensure its quality.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <gtk/gtk.h>
+#include <libdbusmenu-gtk/menu.h>
+#include <libdbusmenu-gtk/client.h>
+
+static GMainLoop * mainloop = NULL;
+static gboolean passed = TRUE;
+static guint death_timer = 0;
+
+static gboolean
+timer_func (gpointer data)
+{
+	passed = TRUE;
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+int
+main (int argc, char ** argv)
+{
+	gtk_init(&argc, &argv);
+
+	g_debug("Building Window");
+	GtkWidget * window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	GtkWidget * menubar = gtk_menu_bar_new();
+	GtkWidget * menuitem = gtk_menu_item_new_with_label("Test");
+
+	DbusmenuGtkMenu * dmenu = dbusmenu_gtkmenu_new ("glib.label.test", "/org/test");
+	DbusmenuGtkClient * dclient = dbusmenu_gtkmenu_get_client(dmenu);
+
+	GtkAccelGroup * agroup = gtk_accel_group_new();
+	dbusmenu_gtkclient_set_accel_group(dclient, agroup);
+
+	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(dmenu));
+	gtk_widget_show(menuitem);
+	gtk_menu_bar_append(menubar, menuitem);
+	gtk_widget_show(menubar);
+	gtk_container_add(GTK_CONTAINER(window), menubar);
+	gtk_window_set_title(GTK_WINDOW(window), "libdbusmenu-gtk test");
+	gtk_widget_show(window);
+
+	death_timer = g_timeout_add_seconds(10, timer_func, window);
+
+	g_debug("Entering Mainloop");
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	if (passed) {
+		g_debug("Quiting");
+		return 0;
+	} else {
+		g_debug("Quiting as we're a failure");
+		return 1;
+	}
+}
diff --git a/tests/test-gtk-shortcut-server.c b/tests/test-gtk-shortcut-server.c
new file mode 100644
index 0000000..428f558
--- /dev/null
+++ b/tests/test-gtk-shortcut-server.c
@@ -0,0 +1,99 @@
+/*
+A test for libdbusmenu to ensure its quality.
+
+Copyright 2009 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+This program is free software: you can redistribute it and/or modify it 
+under the terms of the GNU General Public License version 3, as published 
+by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful, but 
+WITHOUT ANY WARRANTY; without even the implied warranties of 
+MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along 
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <glib.h>
+#include <gdk/gdkkeysyms.h>
+
+#include <dbus/dbus.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+#include <dbus/dbus-glib-bindings.h>
+
+#include <libdbusmenu-glib/menuitem.h>
+#include <libdbusmenu-glib/server.h>
+#include <libdbusmenu-gtk/menuitem.h>
+
+GMainLoop * mainloop = NULL;
+DbusmenuServer * server = NULL;
+
+gboolean
+timer_func (gpointer userdata)
+{
+	g_main_loop_quit(mainloop);
+	return FALSE;
+}
+
+void
+build_menu (void)
+{
+	DbusmenuMenuitem * item;
+
+	DbusmenuMenuitem * root = dbusmenu_menuitem_new();
+
+	item = dbusmenu_menuitem_new();
+	dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Control-C");
+	dbusmenu_menuitem_property_set_shortcut(item, GDK_c, GDK_CONTROL_MASK);
+	dbusmenu_menuitem_child_append(root, item);
+	g_object_unref(item);
+
+
+	dbusmenu_server_set_root(server, root);
+	g_object_unref(root);
+
+	return;
+}
+
+int
+main (int argc, char ** argv)
+{
+	GError * error = NULL;
+
+	g_type_init();
+
+	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
+	g_debug("DBus ID: %s", dbus_connection_get_server_id(dbus_g_connection_get_connection(dbus_g_bus_get(DBUS_BUS_SESSION, NULL))));
+
+	DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
+	guint nameret = 0;
+
+	if (!org_freedesktop_DBus_request_name(bus_proxy, "glib.label.test", 0, &nameret, &error)) {
+		g_error("Unable to call to request name");
+		return 1;
+	}
+
+	if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
+		g_error("Unable to get name");
+		return 1;
+	}
+
+	server = dbusmenu_server_new("/org/test");
+	build_menu();
+
+	g_timeout_add_seconds(10, timer_func, NULL);
+
+	mainloop = g_main_loop_new(NULL, FALSE);
+	g_main_loop_run(mainloop);
+
+	g_debug("Quiting");
+
+	return 0;
+}
+
-- 
cgit v1.2.3


From a7940079b8a074529ea504efe3e9a033197ea057 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 21:24:29 -0500
Subject: Switching to a value array from a ptrarray

---
 libdbusmenu-gtk/menuitem.c | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index f56e9e5..9a374b0 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -160,6 +160,17 @@ dbusmenu_menuitem_property_set_shortcut_string (DbusmenuMenuitem * menuitem, con
 	return dbusmenu_menuitem_property_set_shortcut(menuitem, key, modifier);
 }
 
+/* Append strings to an g_value_array */
+static void
+_g_value_array_append_string (GValueArray * array, const gchar * string)
+{
+	GValue value = {0};
+	g_value_init(&value, G_TYPE_STRING);
+	g_value_set_string(&value, string);
+	g_value_array_append(array, &value);
+	return;
+}
+
 /**
 	dbusmenu_menuitem_property_set_shortcut:
 	@menuitem: The #DbusmenuMenuitem to set the shortcut on
@@ -177,28 +188,31 @@ dbusmenu_menuitem_property_set_shortcut (DbusmenuMenuitem * menuitem, guint key,
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(menuitem), FALSE);
 	g_return_val_if_fail(gtk_accelerator_valid(key, modifier), FALSE);
 
-	GPtrArray * array = g_ptr_array_new();
+	GValueArray * array = g_value_array_new(4); /* Four seems like the max we'd need, plus it's still small */
 
 	if (modifier & GDK_CONTROL_MASK) {
-		g_ptr_array_add(array, g_strdup(DBUSMENU_MENUITEM_SHORTCUT_CONTROL));
+		_g_value_array_append_string(array, DBUSMENU_MENUITEM_SHORTCUT_CONTROL);
 	}
 	if (modifier & GDK_MOD1_MASK) {
-		g_ptr_array_add(array, g_strdup(DBUSMENU_MENUITEM_SHORTCUT_ALT));
+		_g_value_array_append_string(array, DBUSMENU_MENUITEM_SHORTCUT_ALT);
 	}
 	if (modifier & GDK_SHIFT_MASK) {
-		g_ptr_array_add(array, g_strdup(DBUSMENU_MENUITEM_SHORTCUT_SHIFT));
+		_g_value_array_append_string(array, DBUSMENU_MENUITEM_SHORTCUT_SHIFT);
 	}
 	if (modifier & GDK_SUPER_MASK) {
-		g_ptr_array_add(array, g_strdup(DBUSMENU_MENUITEM_SHORTCUT_SUPER));
+		_g_value_array_append_string(array, DBUSMENU_MENUITEM_SHORTCUT_SUPER);
 	}
 
-	g_ptr_array_add(array, g_strdup(gdk_keyval_name(key)));
+	_g_value_array_append_string(array, gdk_keyval_name(key));
 
-	GPtrArray * wrapper = g_ptr_array_new();
-	g_ptr_array_add(wrapper, array);
+	GValueArray * wrapper = g_value_array_new(1);
+	GValue wrap_val = {0};
+	g_value_init(&wrap_val, G_TYPE_VALUE_ARRAY);
+	g_value_set_boxed(&wrap_val, array);
+	g_value_array_append(wrapper, &wrap_val);
 
 	GValue value = {0};
-	g_value_init(&value, G_TYPE_PTR_ARRAY);
+	g_value_init(&value, G_TYPE_VALUE_ARRAY);
 	g_value_set_boxed(&value, wrapper);
 
 	dbusmenu_menuitem_property_set_value(menuitem, DBUSMENU_MENUITEM_PROP_SHORTCUT, &value);
-- 
cgit v1.2.3


From b31f6418f37bc35dc59162d5878eacb5002e3402 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 22:01:56 -0500
Subject: Block the case where the label is being init'd to NULL

---
 libdbusmenu-gtk/genericmenuitem.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index 1000c68..7239864 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -158,6 +158,8 @@ get_hpadding (GtkWidget * widget)
 static void
 set_label (GtkMenuItem * menu_item, const gchar * label)
 {
+	if (label == NULL) return;
+
 	GtkWidget * child = gtk_bin_get_child(GTK_BIN(menu_item));
 	GtkLabel * labelw = NULL;
 	gboolean suppress_update = FALSE;
-- 
cgit v1.2.3


From 2a1ad77c4b91f35b69e42a79b48b2f0cc0f01bfb Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 23:48:51 -0500
Subject: Switching get over to a GValueArray too!

---
 libdbusmenu-gtk/menuitem.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index 9a374b0..a448f88 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -292,19 +292,18 @@ dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * ke
 		return;
 	}
 
-	g_return_if_fail(G_VALUE_HOLDS_BOXED(wrapper));
-
-	GPtrArray * wrapperarray = (GPtrArray *)g_value_get_boxed(wrapper);
-	if (wrapperarray->len == 0) {
+	GValueArray * wrapperarray = (GValueArray *)g_value_get_boxed(wrapper);
+	if (wrapperarray->n_values == 0) {
 		return;
 	}
 
-	if (wrapperarray->len != 1) {
+	if (wrapperarray->n_values != 1) {
 		g_warning("Shortcut is more than one entry.  Which we don't currently support.  Taking the first.");
 	}
 
-	GPtrArray * entryarray = g_ptr_array_index(wrapperarray, 0);
-	if (entryarray->len == 0) {
+	GValue * ventryarray = g_value_array_get_nth(wrapperarray, 0);
+	GValueArray * entryarray = (GValueArray *)g_value_get_boxed(ventryarray);
+	if (entryarray->n_values == 0) {
 		/* Seems a little odd, but really, we're saying that it isn't a
 		   shortcut, so I'm comfortable with exiting silently. */
 		return;
@@ -312,20 +311,20 @@ dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * ke
 
 	/* Parse through modifiers */
 	int i;
-	for (i = 0; i < entryarray->len - 1; i++) {
-		if (g_strcmp0(g_ptr_array_index(entryarray, i), DBUSMENU_MENUITEM_SHORTCUT_CONTROL) == 0) {
+	for (i = 0; i < entryarray->n_values - 1; i++) {
+		if (g_strcmp0(g_value_get_string(g_value_array_get_nth(entryarray, i)), DBUSMENU_MENUITEM_SHORTCUT_CONTROL) == 0) {
 			*modifier |= GDK_CONTROL_MASK;
 			continue;
 		}
-		if (g_strcmp0(g_ptr_array_index(entryarray, i), DBUSMENU_MENUITEM_SHORTCUT_ALT) == 0) {
+		if (g_strcmp0(g_value_get_string(g_value_array_get_nth(entryarray, i)), DBUSMENU_MENUITEM_SHORTCUT_ALT) == 0) {
 			*modifier |= GDK_MOD1_MASK;
 			continue;
 		}
-		if (g_strcmp0(g_ptr_array_index(entryarray, i), DBUSMENU_MENUITEM_SHORTCUT_SHIFT) == 0) {
+		if (g_strcmp0(g_value_get_string(g_value_array_get_nth(entryarray, i)), DBUSMENU_MENUITEM_SHORTCUT_SHIFT) == 0) {
 			*modifier |= GDK_SHIFT_MASK;
 			continue;
 		}
-		if (g_strcmp0(g_ptr_array_index(entryarray, i), DBUSMENU_MENUITEM_SHORTCUT_SUPER) == 0) {
+		if (g_strcmp0(g_value_get_string(g_value_array_get_nth(entryarray, i)), DBUSMENU_MENUITEM_SHORTCUT_SUPER) == 0) {
 			*modifier |= GDK_SUPER_MASK;
 			continue;
 		}
@@ -333,7 +332,7 @@ dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * ke
 
 	GdkModifierType tempmod;
 
-	gtk_accelerator_parse(g_ptr_array_index(entryarray, entryarray->len - 1), key, &tempmod);
+	gtk_accelerator_parse(g_value_get_string(g_value_array_get_nth(entryarray, entryarray->n_values - 1)), key, &tempmod);
 
 	return;
 }
-- 
cgit v1.2.3


From 02a8c4e2b1eff14575d1cb78fb35b483f1e35ad7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Mon, 14 Jun 2010 23:57:38 -0500
Subject: More robust comparison

---
 tests/run-xvfb.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/run-xvfb.sh b/tests/run-xvfb.sh
index 3622dbf..3aa05c1 100644
--- a/tests/run-xvfb.sh
+++ b/tests/run-xvfb.sh
@@ -1,4 +1,4 @@
-if [ "$DISPLAY" == "" ]; then
+if [ "x$DISPLAY" == "x" ]; then
 Xvfb -ac -noreset -screen 0 800x600x16 -help 2>/dev/null 1>&2
 XID=`for id in 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 ; do test -e /tmp/.X$id-lock || { echo $id; exit 0; }; done; exit 1`
 { Xvfb -ac -noreset -screen 0 800x600x16 :$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & trap "kill -15 $! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; }
-- 
cgit v1.2.3


From 97513daeb03ba302613de3ebbfcf356bc75fa611 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 15 Jun 2010 13:49:05 -0500
Subject: Switch to using the accel map with paths

---
 libdbusmenu-gtk/client.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index ab7f16c..a9c6657 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -153,17 +153,20 @@ swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) {
 		return;
 	}
 
-	if (data->old_agroup != NULL) {
-		gtk_widget_remove_accelerator(GTK_WIDGET(gmi), data->old_agroup, key, modifiers);
+	const gchar * accel_path = gtk_menu_item_get_accel_path(gmi);
+
+	if (accel_path != NULL) {
+		gtk_accel_map_change_entry(accel_path, key, modifiers, TRUE /* replace */);
+	} else {
+		gchar * accel_path = g_strdup_printf("<Appmenus>/Generated/%d", dbusmenu_menuitem_get_id(mi));
+		gtk_accel_map_add_entry(accel_path, key, modifiers);
+		gtk_menu_item_set_accel_path(gmi, accel_path);
+		g_free(accel_path);
 	}
 
-	if (data->new_agroup != NULL) {
-		gtk_widget_add_accelerator(GTK_WIDGET(gmi),
-		                           "activate",
-		                           data->new_agroup,
-		                           key,
-		                           modifiers,
-		                           GTK_ACCEL_VISIBLE);
+	GtkMenu * submenu = dbusmenu_gtkclient_menuitem_get_submenu(data->client, mi);
+	if (submenu != NULL) {
+		gtk_menu_set_accel_group(submenu, data->new_agroup);
 	}
 
 	return;
-- 
cgit v1.2.3


From d0bbb5a0985adccf54cf857d4b0f17a8ba803cd2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 15 Jun 2010 13:50:52 -0500
Subject: Setting the accel widget for the accel label.

---
 libdbusmenu-gtk/genericmenuitem.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index 7239864..30b072f 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -196,6 +196,7 @@ set_label (GtkMenuItem * menu_item, const gchar * label)
 		labelw = GTK_LABEL(gtk_accel_label_new(label));
 		gtk_label_set_use_underline(GTK_LABEL(labelw), TRUE);
 		gtk_misc_set_alignment(GTK_MISC(labelw), 0.0, 0.5);
+		gtk_accel_label_set_accel_widget(GTK_ACCEL_LABEL(labelw), GTK_WIDGET(menu_item));
 		gtk_widget_show(GTK_WIDGET(labelw));
 
 		/* Check to see if it needs to be in the bin for this
-- 
cgit v1.2.3


From 81f4b7c5e21a23e97bdd267567b40cdbe0d528b7 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 15 Jun 2010 14:10:22 -0500
Subject: Making the path more unique and using the lower level path set
 function.

---
 libdbusmenu-gtk/client.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index a9c6657..c7d1140 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -158,9 +158,9 @@ swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) {
 	if (accel_path != NULL) {
 		gtk_accel_map_change_entry(accel_path, key, modifiers, TRUE /* replace */);
 	} else {
-		gchar * accel_path = g_strdup_printf("<Appmenus>/Generated/%d", dbusmenu_menuitem_get_id(mi));
+		gchar * accel_path = g_strdup_printf("<Appmenus>/Generated/%X/%d", GPOINTER_TO_UINT(data->client), dbusmenu_menuitem_get_id(mi));
 		gtk_accel_map_add_entry(accel_path, key, modifiers);
-		gtk_menu_item_set_accel_path(gmi, accel_path);
+		gtk_widget_set_accel_path(GTK_WIDGET(gmi), accel_path, data->new_agroup);
 		g_free(accel_path);
 	}
 
-- 
cgit v1.2.3


From fca6f989e2c563ac071322a0f664bdebdcfdf79e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 15 Jun 2010 14:21:44 -0500
Subject: Making sure the accel group gets added to the window

---
 tests/test-gtk-shortcut-client.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test-gtk-shortcut-client.c b/tests/test-gtk-shortcut-client.c
index 26e1531..003885c 100644
--- a/tests/test-gtk-shortcut-client.c
+++ b/tests/test-gtk-shortcut-client.c
@@ -57,6 +57,7 @@ main (int argc, char ** argv)
 	gtk_widget_show(menubar);
 	gtk_container_add(GTK_CONTAINER(window), menubar);
 	gtk_window_set_title(GTK_WINDOW(window), "libdbusmenu-gtk test");
+	gtk_window_add_accel_group(GTK_WINDOW(window), agroup);
 	gtk_widget_show(window);
 
 	death_timer = g_timeout_add_seconds(10, timer_func, window);
-- 
cgit v1.2.3


From 607356d413f548b067020bcabed0aa78337066ef Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 15 Jun 2010 14:42:35 -0500
Subject: Switching to control L just in case

---
 tests/test-gtk-shortcut-server.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test-gtk-shortcut-server.c b/tests/test-gtk-shortcut-server.c
index 428f558..3b703a1 100644
--- a/tests/test-gtk-shortcut-server.c
+++ b/tests/test-gtk-shortcut-server.c
@@ -49,8 +49,8 @@ build_menu (void)
 	DbusmenuMenuitem * root = dbusmenu_menuitem_new();
 
 	item = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Control-C");
-	dbusmenu_menuitem_property_set_shortcut(item, GDK_c, GDK_CONTROL_MASK);
+	dbusmenu_menuitem_property_set(item, DBUSMENU_MENUITEM_PROP_LABEL, "Control-L");
+	dbusmenu_menuitem_property_set_shortcut(item, GDK_l, GDK_CONTROL_MASK);
 	dbusmenu_menuitem_child_append(root, item);
 	g_object_unref(item);
 
-- 
cgit v1.2.3


From 71817a1eed1c49d358d7cb1c093321ddc91fb258 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Tue, 15 Jun 2010 14:47:29 -0500
Subject: Adding a debug message

---
 libdbusmenu-gtk/client.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index c7d1140..d45360a 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -143,6 +143,8 @@ swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) {
 	GdkModifierType modifiers = 0;
 
 	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;
-- 
cgit v1.2.3


From 16851654b11b15fe43ffb97ce8b4f26a7e2601c6 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Thu, 17 Jun 2010 14:58:28 -0500
Subject: Wrong name for the property

---
 libdbusmenu-glib/menuitem.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index 39d257e..0d79ebb 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -58,7 +58,7 @@ G_BEGIN_DECLS
 #define DBUSMENU_MENUITEM_PROP_ICON_DATA             "icon-data"
 #define DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE           "toggle-type"
 #define DBUSMENU_MENUITEM_PROP_TOGGLE_STATE          "toggle-state"
-#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY         "child-display"
+#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY         "children-display"
 
 #define DBUSMENU_MENUITEM_TOGGLE_CHECK               "checkmark"
 #define DBUSMENU_MENUITEM_TOGGLE_RADIO               "radio"
-- 
cgit v1.2.3


From cfdd33a19758224cb835efa705a410d3d4d0db91 Mon Sep 17 00:00:00 2001
From: Cody Russell <crussell@canonical.com>
Date: Mon, 21 Jun 2010 14:37:18 -0500
Subject: Add the accelerators.

---
 libdbusmenu-gtk/client.c | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index d45360a..91bc816 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -130,13 +130,13 @@ struct _swap_agroup_t {
 
 /* Looks at the old version of the accelerator group and
    the new one and makes the state proper. */
-static void
-swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) {
-	swap_agroup_t * data = (swap_agroup_t *)userdata;
+static gboolean
+do_swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) {
+        swap_agroup_t * data = (swap_agroup_t *)userdata;
 
 	/* If we don't have a shortcut we don't care */
 	if (!dbusmenu_menuitem_property_exist(mi, DBUSMENU_MENUITEM_PROP_SHORTCUT)) {
-		return;
+		return FALSE;
 	}
 
 	guint key = 0;
@@ -145,14 +145,14 @@ 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;
+		return FALSE;
 	}
 
 	GtkMenuItem * gmi = dbusmenu_gtkclient_menuitem_get(data->client, mi);
 	if (gmi == NULL) {
-		return;
+		return FALSE;
 	}
 
 	const gchar * accel_path = gtk_menu_item_get_accel_path(gmi);
@@ -161,6 +161,7 @@ swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) {
 		gtk_accel_map_change_entry(accel_path, key, modifiers, TRUE /* replace */);
 	} else {
 		gchar * accel_path = g_strdup_printf("<Appmenus>/Generated/%X/%d", GPOINTER_TO_UINT(data->client), dbusmenu_menuitem_get_id(mi));
+
 		gtk_accel_map_add_entry(accel_path, key, modifiers);
 		gtk_widget_set_accel_path(GTK_WIDGET(gmi), accel_path, data->new_agroup);
 		g_free(accel_path);
@@ -171,7 +172,14 @@ swap_agroup (DbusmenuMenuitem * mi, gpointer userdata) {
 		gtk_menu_set_accel_group(submenu, data->new_agroup);
 	}
 
-	return;
+	return TRUE;
+}
+
+static void
+swap_agroup (DbusmenuMenuitem *mi, gpointer userdata) {
+        do_swap_agroup (mi, userdata);
+
+        return;  /* See what I did here, Ted? :)  */
 }
 
 /* Refresh the shortcut for an entry */
@@ -188,7 +196,17 @@ refresh_shortcut (DbusmenuGtkClient * client, DbusmenuMenuitem * mi)
 	data.old_agroup = priv->agroup;
 	data.new_agroup = priv->agroup;
 
-	return swap_agroup(mi, &data);
+	if (do_swap_agroup(mi, &data)) {
+                guint key;
+                GdkModifierType mod;
+                GtkMenuItem *gmi = dbusmenu_gtkclient_menuitem_get (client, mi);
+
+                dbusmenu_menuitem_property_get_shortcut (mi, &key, &mod);
+
+                gtk_widget_add_accelerator (GTK_WIDGET (gmi), "activate", priv->agroup, key, mod, GTK_ACCEL_VISIBLE);
+        }
+
+        return;
 }
 
 
-- 
cgit v1.2.3