From 3c9734543b84ecd412ffd214ac0560b11858a00a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 5 Jun 2009 15:05:12 -0500
Subject: Making the ID update function rebuild all of the properties.  Result
 of a code review comment by Cody Russell.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index c6833cc..6094eca 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -86,6 +86,7 @@ static DbusmenuMenuitem * parse_layout_xml(xmlNodePtr node, DbusmenuMenuitem * i
 static void parse_layout (DbusmenuClient * client, const gchar * layout);
 static void update_layout_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data);
 static void update_layout (DbusmenuClient * client);
+static void menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data);
 
 /* Build a type */
 G_DEFINE_TYPE (DbusmenuClient, dbusmenu_client, G_TYPE_OBJECT);
@@ -267,7 +268,7 @@ id_update (DBusGProxy * proxy, guint id, DbusmenuClient * client)
 	DbusmenuMenuitem * menuitem = dbusmenu_menuitem_find_id(priv->root, id);
 	g_return_if_fail(menuitem != NULL);
 
-	/* dbusmenu_menuitem_property_set(menuitem, property, value); */
+	org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, menuitem);
 	return;
 }
 
-- 
cgit v1.2.3


From a0ba99c7840a0db2eb957138854050060221a8df Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 18 Jun 2009 15:28:54 -0500
Subject: Handling the concept of not having a property proxy.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 61f8c34..ea77cc3 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -499,6 +499,10 @@ update_layout (DbusmenuClient * client)
 {
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
 
+	if (priv->propproxy == NULL) {
+		return;
+	}
+
 	if (priv->layoutcall != NULL) {
 		return;
 	}
@@ -554,7 +558,8 @@ dbusmenu_client_new (const gchar * name, const gchar * object)
 	it could block longer.
 
 	Return value: A #DbusmenuMenuitem representing the root of
-		menu on the server.
+		menu on the server.  If there is no server or there is
+		an error receiving its layout it'll return #NULL.
 */
 DbusmenuMenuitem *
 dbusmenu_client_get_root (DbusmenuClient * client)
@@ -563,6 +568,10 @@ dbusmenu_client_get_root (DbusmenuClient * client)
 
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
 
+	if (priv->propproxy == NULL) {
+		return NULL;
+	}
+
 	if (priv->layoutcall != NULL) {
 		/* Will end the current call and block on it's completion */
 		update_layout_cb(priv->propproxy, priv->layoutcall, client);
-- 
cgit v1.2.3


From 6b29e7e5a258644cc0c82963aab5d167748f8af2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 18 Jun 2009 16:30:13 -0500
Subject: If we can't get a proxy on the stuff that we want, we're going to set
 up a DBus one and just wait for it to show up.  When it showes up, then we'll
 pounce

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index ea77cc3..fec495d 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -64,6 +64,8 @@ struct _DbusmenuClientPrivate
 	DBusGProxy * menuproxy;
 	DBusGProxy * propproxy;
 	DBusGProxyCall * layoutcall;
+
+	DBusGProxy * dbusproxy;
 };
 
 #define DBUSMENU_CLIENT_GET_PRIVATE(o) \
@@ -147,6 +149,8 @@ dbusmenu_client_init (DbusmenuClient *self)
 	priv->propproxy = NULL;
 	priv->layoutcall = NULL;
 
+	priv->dbusproxy = NULL;
+
 	return;
 }
 
@@ -167,6 +171,10 @@ dbusmenu_client_dispose (GObject *object)
 		g_object_unref(G_OBJECT(priv->propproxy));
 		priv->propproxy = NULL;
 	}
+	if (priv->dbusproxy != NULL) {
+		g_object_unref(G_OBJECT(priv->dbusproxy));
+		priv->dbusproxy = NULL;
+	}
 	priv->session_bus = NULL;
 
 	if (priv->root != NULL) {
@@ -276,6 +284,62 @@ id_update (DBusGProxy * proxy, guint id, DbusmenuClient * client)
 	return;
 }
 
+/* Watches to see if our DBus savior comes onto the bus */
+static void
+dbus_owner_change (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, DbusmenuClient * client)
+{
+	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
+
+	if (!(new != NULL && prev == NULL)) {
+		/* If it's not someone new getting on the bus, sorry we
+		   simply just don't care.  It's not that your service isn't
+		   important to someone, just not us.  You'll find the right
+		   process someday, there's lots of processes out there. */
+		return;
+	}
+
+	if (g_strcmp0(new, priv->dbus_name)) {
+		/* Again, someone else's service. */
+		return;
+	}
+
+	/* Woot!  A service for us to love and to hold for ever
+	   and ever and ever! */
+	return build_proxies(client);
+}
+
+/* This function builds the DBus proxy which will look out for
+   the service coming up. */
+static void
+build_dbus_proxy (DbusmenuClient * client)
+{
+	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
+	GError * error = NULL;
+
+	if (priv->dbusproxy != NULL) {
+		return;
+	}
+
+	priv->dbusproxy = dbus_g_proxy_new_for_name_owner (priv->session_bus,
+	                                                   DBUS_SERVICE_DBUS,
+	                                                   DBUS_PATH_DBUS,
+	                                                   DBUS_INTERFACE_DBUS,
+	                                                   &error);
+	if (error != NULL) {
+		g_debug("Oh, that's bad.  That's really bad.  We can't get a proxy to DBus itself?  Seriously?  Here's all I know: %s", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	dbus_g_proxy_add_signal(priv->dbusproxy, "NameOwnerChanged",
+	                        G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
+	                        G_TYPE_INVALID);
+	dbus_g_proxy_connect_signal(priv->dbusproxy, "NameOwnerChanged",
+	                            G_CALLBACK(dbus_owner_change), client, NULL);
+
+	return;
+}
+
 /* When we have a name and an object, build the two proxies and get the
    first version of the layout */
 static void
@@ -291,6 +355,7 @@ build_proxies (DbusmenuClient * client)
 	if (error != NULL) {
 		g_error("Unable to get session bus: %s", error->message);
 		g_error_free(error);
+		build_dbus_proxy(client);
 		return;
 	}
 
@@ -304,6 +369,7 @@ build_proxies (DbusmenuClient * client)
 		g_error_free(error);
 		return;
 	}
+	// g_signal_connect(G_OBJECT(priv->propproxy), "destroy", proxy_destroyed, client);
 
 	priv->menuproxy = dbus_g_proxy_new_for_name_owner(priv->session_bus,
 	                                                  priv->dbus_name,
@@ -315,6 +381,13 @@ build_proxies (DbusmenuClient * client)
 		g_error_free(error);
 		return;
 	}
+	// g_signal_connect(G_OBJECT(priv->menuproxy), "destroy", proxy_destroyed, client);
+
+	/* If we get here, we don't need the DBus proxy */
+	if (priv->dbusproxy != NULL) {
+		g_object_unref(G_OBJECT(priv->dbusproxy));
+		priv->dbusproxy = NULL;
+	}
 
 	dbus_g_proxy_add_signal(priv->menuproxy, "LayoutUpdate", G_TYPE_INVALID);
 	dbus_g_proxy_connect_signal(priv->menuproxy, "LayoutUpdate", G_CALLBACK(layout_update), client, NULL);
-- 
cgit v1.2.3


From f56565b09f6747442f94f0218466f1a3d6b8869d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 18 Jun 2009 16:54:25 -0500
Subject: Handle the server removing itself from the bus and putting us into a
 dark world waiting for it to rejoin the world.

---
 libdbusmenu-glib/client.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index fec495d..043bf43 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -340,6 +340,27 @@ build_dbus_proxy (DbusmenuClient * client)
 	return;
 }
 
+/* A signal handler that gets called when a proxy is destoryed a
+   so it needs to clean up a little.  Make sure we don't think we
+   have a layout and setup the dbus watcher. */
+static void
+proxy_destroyed (GObject * gobj_proxy, gpointer userdata)
+{
+	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(userdata);
+
+	if (priv->root != NULL) {
+		g_object_unref(G_OBJECT(priv->root));
+		priv->root = NULL;
+	}
+
+	if ((gpointer)priv->menuproxy == (gpointer)gobj_proxy) {
+		priv->layoutcall = NULL;
+	}
+
+	build_dbus_proxy(DBUSMENU_CLIENT(userdata));
+	return;
+}
+
 /* When we have a name and an object, build the two proxies and get the
    first version of the layout */
 static void
@@ -369,7 +390,8 @@ build_proxies (DbusmenuClient * client)
 		g_error_free(error);
 		return;
 	}
-	// g_signal_connect(G_OBJECT(priv->propproxy), "destroy", proxy_destroyed, client);
+	g_object_add_weak_pointer(G_OBJECT(priv->propproxy), (gpointer *)&priv->propproxy);
+	g_signal_connect(G_OBJECT(priv->propproxy), "destroy", G_CALLBACK(proxy_destroyed), client);
 
 	priv->menuproxy = dbus_g_proxy_new_for_name_owner(priv->session_bus,
 	                                                  priv->dbus_name,
@@ -381,7 +403,8 @@ build_proxies (DbusmenuClient * client)
 		g_error_free(error);
 		return;
 	}
-	// g_signal_connect(G_OBJECT(priv->menuproxy), "destroy", proxy_destroyed, client);
+	g_object_add_weak_pointer(G_OBJECT(priv->menuproxy), (gpointer *)&priv->menuproxy);
+	g_signal_connect(G_OBJECT(priv->menuproxy), "destroy", G_CALLBACK(proxy_destroyed), client);
 
 	/* If we get here, we don't need the DBus proxy */
 	if (priv->dbusproxy != NULL) {
-- 
cgit v1.2.3


From 369442ddbe17b5886f0dfb3d3cfc54b3d0518186 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 18 Jun 2009 16:56:11 -0500
Subject: Making it so that if we clear the menu structure by destroying the
 proxies we also signal that to the callers.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 043bf43..97265db 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -351,6 +351,7 @@ proxy_destroyed (GObject * gobj_proxy, gpointer userdata)
 	if (priv->root != NULL) {
 		g_object_unref(G_OBJECT(priv->root));
 		priv->root = NULL;
+		g_signal_emit(G_OBJECT(userdata), signals[LAYOUT_UPDATED], 0, TRUE);
 	}
 
 	if ((gpointer)priv->menuproxy == (gpointer)gobj_proxy) {
-- 
cgit v1.2.3


From 33840cbf787d90bde160184e170a211b809b6306 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 23 Jun 2009 14:38:58 -0500
Subject: Adding in the 'moved' signal and make it so that the 'added' signal
 has the position in it.

---
 libdbusmenu-glib/menuitem-marshal.list |  2 ++
 libdbusmenu-glib/menuitem.c            | 29 ++++++++++++++++++++++++-----
 libdbusmenu-glib/menuitem.h            |  5 ++++-
 3 files changed, 30 insertions(+), 6 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem-marshal.list b/libdbusmenu-glib/menuitem-marshal.list
index fc0318f..a32e7e3 100644
--- a/libdbusmenu-glib/menuitem-marshal.list
+++ b/libdbusmenu-glib/menuitem-marshal.list
@@ -1,3 +1,5 @@
 VOID: STRING, STRING
+VOID: OBJECT, UINT, UINT
+VOID: OBJECT, UINT
 VOID: OBJECT
 VOID: VOID
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 95391a4..9a16353 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -58,6 +58,7 @@ enum {
 	ITEM_ACTIVATED,
 	CHILD_ADDED,
 	CHILD_REMOVED,
+	CHILD_MOVED,
 	LAST_SIGNAL
 };
 
@@ -129,6 +130,7 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass)
 		DbusmenuMenuitem::child-added:
 		@arg0: The #DbusmenuMenuitem which is the parent.
 		@arg1: The #DbusmenuMenuitem which is the child.
+		@arg2: The position that the child is being added in.
 
 		Signaled when the child menuitem has been added to
 		the parent.
@@ -138,8 +140,8 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass)
 	                                           G_SIGNAL_RUN_LAST,
 	                                           G_STRUCT_OFFSET(DbusmenuMenuitemClass, child_added),
 	                                           NULL, NULL,
-	                                           _dbusmenu_menuitem_marshal_VOID__OBJECT,
-	                                           G_TYPE_NONE, 1, G_TYPE_OBJECT);
+	                                           _dbusmenu_menuitem_marshal_VOID__OBJECT_UINT,
+	                                           G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_UINT);
 	/**
 		DbusmenuMenuitem::child-removed:
 		@arg0: The #DbusmenuMenuitem which was the parent.
@@ -157,6 +159,23 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass)
 	                                           NULL, NULL,
 	                                           _dbusmenu_menuitem_marshal_VOID__OBJECT,
 	                                           G_TYPE_NONE, 1, G_TYPE_OBJECT);
+	/**
+		DbusmenuMenuitem::child-moved:
+		@arg0: The #DbusmenuMenuitem which is the parent.
+		@arg1: The #DbusmenuMenuitem which is the child.
+		@arg2: The position that the child is being moved to.
+		@arg3: The position that the child is was in.
+
+		Signaled when the child menuitem has had it's location
+		in the list change.
+	*/
+	signals[CHILD_MOVED] =        g_signal_new(DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED,
+	                                           G_TYPE_FROM_CLASS(klass),
+	                                           G_SIGNAL_RUN_LAST,
+	                                           G_STRUCT_OFFSET(DbusmenuMenuitemClass, child_moved),
+	                                           NULL, NULL,
+	                                           _dbusmenu_menuitem_marshal_VOID__OBJECT_UINT_UINT,
+	                                           G_TYPE_NONE, 3, G_TYPE_OBJECT, G_TYPE_UINT, G_TYPE_UINT);
 
 	g_object_class_install_property (object_class, PROP_ID,
 	                                 g_param_spec_uint("id", "ID for the menu item",
@@ -398,7 +417,7 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 	priv->children = g_list_append(priv->children, child);
-	g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, TRUE);
+	g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, g_list_length(priv->children) - 1, TRUE);
 	return TRUE;
 }
 
@@ -420,7 +439,7 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 	priv->children = g_list_prepend(priv->children, child);
-	g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, TRUE);
+	g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, 0, TRUE);
 	return TRUE;
 }
 
@@ -467,7 +486,7 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem *
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
 	priv->children = g_list_insert(priv->children, child, position);
-	g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, TRUE);
+	g_signal_emit(G_OBJECT(mi), signals[CHILD_ADDED], 0, child, position, TRUE);
 	return TRUE;
 }
 
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index c4fcf73..18c6e9a 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -46,6 +46,7 @@ G_BEGIN_DECLS
 #define DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED      "item-activated"
 #define DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED         "child-added"
 #define DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED       "child-removed"
+#define DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED         "child-moved"
 
 /**
 	DbusmenuMenuitem:
@@ -69,6 +70,7 @@ struct _DbusmenuMenuitem
 	@item_activated: Slot for #DbusmenuMenuitem::item-activated.
 	@child_added: Slot for #DbusmenuMenuitem::child-added.
 	@child_removed: Slot for #DbusmenuMenuitem::child-removed.
+	@child_moved: Slot for #DbusmenuMenuitem::child-moved.
 	@buildxml: Virtual function that appends the strings required
 	           to represent this menu item in the menu XML file.
 	@reserved1: Reserved for future use.
@@ -84,8 +86,9 @@ struct _DbusmenuMenuitemClass
 	/* Signals */
 	void (*property_changed) (gchar * property, gchar * value);
 	void (*item_activated) (void);
-	void (*child_added) (DbusmenuMenuitem * child);
+	void (*child_added) (DbusmenuMenuitem * child, guint position);
 	void (*child_removed) (DbusmenuMenuitem * child);
+	void (*child_moved) (DbusmenuMenuitem * child, guint oldpos, guint newpos);
 
 	/* Virtual functions */
 	void (*buildxml) (GPtrArray * stringarray);
-- 
cgit v1.2.3


From de09b3a907fa4ace875dd2446a9217b940ede6b5 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 23 Jun 2009 15:00:45 -0500
Subject: Now we're also signalling when a child gets moved around.

---
 libdbusmenu-glib/menuitem.c | 12 ++++++++++++
 libdbusmenu-glib/menuitem.h |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 9a16353..57f1832 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -509,9 +509,21 @@ dbusmenu_menuitem_child_reorder(DbusmenuMenuitem * mi, DbusmenuMenuitem * child,
 	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE);
 
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+	gint oldpos = g_list_index(priv->children, child);
+
+	if (oldpos == -1) {
+		g_warning("Can not reorder child that isn't actually a child.");
+		return FALSE;
+	}
+	if (oldpos == position) {
+		return TRUE;
+	}
+
 	priv->children = g_list_remove(priv->children, child);
 	priv->children = g_list_insert(priv->children, child, position);
 
+	g_signal_emit(G_OBJECT(mi), signals[CHILD_MOVED], 0, child, position, oldpos, TRUE);
+
 	return TRUE;
 }
 
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index 18c6e9a..bad687b 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -88,7 +88,7 @@ struct _DbusmenuMenuitemClass
 	void (*item_activated) (void);
 	void (*child_added) (DbusmenuMenuitem * child, guint position);
 	void (*child_removed) (DbusmenuMenuitem * child);
-	void (*child_moved) (DbusmenuMenuitem * child, guint oldpos, guint newpos);
+	void (*child_moved) (DbusmenuMenuitem * child, guint newpos, guint oldpos);
 
 	/* Virtual functions */
 	void (*buildxml) (GPtrArray * stringarray);
-- 
cgit v1.2.3


From 6d57a21249c6089514bdaca9b6fe041296adeec3 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 23 Jun 2009 15:44:29 -0500
Subject: Adding two new signals to the client.  'root-changed' and
 'new-menuitem' to make it so that this can go up the stack easier.

---
 libdbusmenu-glib/client.c | 35 +++++++++++++++++++++++++++++++++++
 libdbusmenu-glib/client.h |  4 ++++
 2 files changed, 39 insertions(+)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index d5e4334..f7de67f 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -47,6 +47,8 @@ enum {
 /* Signals */
 enum {
 	LAYOUT_UPDATED,
+	ROOT_CHANGED,
+	NEW_MENUITEM,
 	LAST_SIGNAL
 };
 
@@ -120,6 +122,39 @@ dbusmenu_client_class_init (DbusmenuClientClass *klass)
 	                                        NULL, NULL,
 	                                        g_cclosure_marshal_VOID__VOID,
 	                                        G_TYPE_NONE, 0, G_TYPE_NONE);
+	/**
+		DbusmenuClient::root-changed:
+		@arg0: The #DbusmenuClient object
+		@arg1: The new root #DbusmenuMenuitem
+
+		The layout has changed in a way that can not be
+		represented by the individual items changing as the
+		root of this client has changed.
+	*/
+	signals[ROOT_CHANGED]    = g_signal_new(DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED,
+	                                        G_TYPE_FROM_CLASS (klass),
+	                                        G_SIGNAL_RUN_LAST,
+	                                        G_STRUCT_OFFSET (DbusmenuClientClass, root_changed),
+	                                        NULL, NULL,
+	                                        g_cclosure_marshal_VOID__OBJECT,
+	                                        G_TYPE_NONE, 1, G_TYPE_OBJECT);
+	/**
+		DbusmenuClient::new-menuitem:
+		@arg0: The #DbusmenuClient object
+		@arg1: The new #DbusmenuMenuitem created
+
+		Signaled when the client creates a new menuitem.  This
+		doesn't mean that it's placed anywhere.  The parent that
+		it's applied to will signal #DbusmenuMenuitem::child-added
+		when it gets parented.
+	*/
+	signals[NEW_MENUITEM]    = g_signal_new(DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM,
+	                                        G_TYPE_FROM_CLASS (klass),
+	                                        G_SIGNAL_RUN_LAST,
+	                                        G_STRUCT_OFFSET (DbusmenuClientClass, new_menuitem),
+	                                        NULL, NULL,
+	                                        g_cclosure_marshal_VOID__OBJECT,
+	                                        G_TYPE_NONE, 1, G_TYPE_OBJECT);
 
 	g_object_class_install_property (object_class, PROP_DBUSOBJECT,
 	                                 g_param_spec_string(DBUSMENU_CLIENT_PROP_DBUS_OBJECT, "DBus Object we represent",
diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index d591ebb..35f7122 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -44,6 +44,8 @@ G_BEGIN_DECLS
 #define DBUSMENU_CLIENT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), DBUSMENU_TYPE_CLIENT, DbusmenuClientClass))
 
 #define DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED  "layout-updated"
+#define DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED    "root-changed"
+#define DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM    "new-menuitem"
 
 #define DBUSMENU_CLIENT_PROP_DBUS_NAME     "dbus-name"
 #define DBUSMENU_CLIENT_PROP_DBUS_OBJECT   "dbus-object"
@@ -66,6 +68,8 @@ struct _DbusmenuClientClass {
 	GObjectClass parent_class;
 
 	void (*layout_updated)(void);
+	void (*root_changed) (DbusmenuMenuitem * newroot);
+	void (*new_menuitem) (DbusmenuMenuitem * newitem);
 
 	/* Reserved for future use */
 	void (*reserved1) (void);
-- 
cgit v1.2.3


From 8c3a3f8a0b0418e4cd93413fade9a43bb549f546 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 23 Jun 2009 15:48:23 -0500
Subject: Signaling the new menuitem.

---
 libdbusmenu-glib/client.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index f7de67f..5bf7087 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -86,7 +86,7 @@ static void id_prop_update (DBusGProxy * proxy, guint id, gchar * property, gcha
 static void id_update (DBusGProxy * proxy, guint id, DbusmenuClient * client);
 static void build_proxies (DbusmenuClient * client);
 static guint parse_node_get_id (xmlNodePtr node);
-static DbusmenuMenuitem * parse_layout_xml(xmlNodePtr node, DbusmenuMenuitem * item, DbusmenuMenuitem * parent, DBusGProxy * proxy);
+static DbusmenuMenuitem * parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * item, DbusmenuMenuitem * parent, DBusGProxy * proxy);
 static void parse_layout (DbusmenuClient * client, const gchar * layout);
 static void update_layout_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data);
 static void update_layout (DbusmenuClient * client);
@@ -515,7 +515,7 @@ menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError
 /* Parse recursively through the XML and make it into
    objects as need be */
 static DbusmenuMenuitem *
-parse_layout_xml(xmlNodePtr node, DbusmenuMenuitem * item, DbusmenuMenuitem * parent, DBusGProxy * proxy)
+parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * item, DbusmenuMenuitem * parent, DBusGProxy * proxy)
 {
 	guint id = parse_node_get_id(node);
 	/* g_debug("Looking at node with id: %d", id); */
@@ -535,6 +535,7 @@ parse_layout_xml(xmlNodePtr node, DbusmenuMenuitem * item, DbusmenuMenuitem * pa
 
 		/* Build a new item */
 		item = dbusmenu_menuitem_new_with_id(id);
+		g_signal_emit(G_OBJECT(client), signals[NEW_MENUITEM], 0, item, TRUE);
 		/* Get the properties queued up for this item */
 		org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, item);
 	} 
@@ -559,7 +560,7 @@ parse_layout_xml(xmlNodePtr node, DbusmenuMenuitem * item, DbusmenuMenuitem * pa
 			}
 		}
 
-		childmi = parse_layout_xml(children, childmi, item, proxy);
+		childmi = parse_layout_xml(client, children, childmi, item, proxy);
 		dbusmenu_menuitem_child_add_position(item, childmi, position);
 	}
 
@@ -588,7 +589,7 @@ parse_layout (DbusmenuClient * client, const gchar * layout)
 
 	xmlNodePtr root = xmlDocGetRootElement(xmldoc);
 
-	priv->root = parse_layout_xml(root, priv->root, NULL, priv->menuproxy);
+	priv->root = parse_layout_xml(client, root, priv->root, NULL, priv->menuproxy);
 	if (priv->root == NULL) {
 		g_warning("Unable to parse layout on client %s object %s: %s", priv->dbus_name, priv->dbus_object, layout);
 	}
-- 
cgit v1.2.3


From df10a41905899f303eb8d63267e6bd385ba538d4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 23 Jun 2009 15:54:49 -0500
Subject: Signaling on root changes.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 5bf7087..5c429c8 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -387,6 +387,7 @@ proxy_destroyed (GObject * gobj_proxy, gpointer userdata)
 	if (priv->root != NULL) {
 		g_object_unref(G_OBJECT(priv->root));
 		priv->root = NULL;
+		g_signal_emit(G_OBJECT(userdata), signals[ROOT_CHANGED], 0, NULL, TRUE);
 		g_signal_emit(G_OBJECT(userdata), signals[LAYOUT_UPDATED], 0, TRUE);
 	}
 
@@ -589,12 +590,18 @@ parse_layout (DbusmenuClient * client, const gchar * layout)
 
 	xmlNodePtr root = xmlDocGetRootElement(xmldoc);
 
+	DbusmenuMenuitem * oldroot = priv->root;
 	priv->root = parse_layout_xml(client, root, priv->root, NULL, priv->menuproxy);
+	xmlFreeDoc(xmldoc);
+
 	if (priv->root == NULL) {
 		g_warning("Unable to parse layout on client %s object %s: %s", priv->dbus_name, priv->dbus_object, layout);
 	}
 
-	xmlFreeDoc(xmldoc);
+	if (priv->root != oldroot) {
+		g_signal_emit(G_OBJECT(client), signals[ROOT_CHANGED], 0, priv->root, TRUE);
+	}
+
 	return;
 }
 
-- 
cgit v1.2.3


From ceacc52b9ce52feb4e3b12cbfd802f38c65a8b4a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 26 Jun 2009 11:08:06 -0500
Subject: Flipping arround the original update of the layout to be after
 building the proxies, not something driven by new.  Also ensuring that the
 callback pointer is reset when we're in it so that it doesn't get called
 recursively.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 5c429c8..4308d58 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -460,6 +460,8 @@ build_proxies (DbusmenuClient * client)
 	dbus_g_proxy_add_signal(priv->menuproxy, "IdUpdate", G_TYPE_UINT, G_TYPE_INVALID);
 	dbus_g_proxy_connect_signal(priv->menuproxy, "IdUpdate", G_CALLBACK(id_update), client, NULL);
 
+	update_layout(client);
+
 	return;
 }
 
@@ -615,9 +617,9 @@ update_layout_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data)
 	GError * error = NULL;
 	GValue value = {0};
 
+	priv->layoutcall = NULL;
 	if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &value, G_TYPE_INVALID)) {
 		g_warning("Getting layout failed on client %s object %s: %s", priv->dbus_name, priv->dbus_object, error->message);
-		priv->layoutcall = NULL;
 		g_error_free(error);
 		return;
 	}
@@ -626,7 +628,6 @@ update_layout_cb (DBusGProxy * proxy, DBusGProxyCall * call, void * data)
 	/* g_debug("Got layout string: %s", xml); */
 	parse_layout(client, xml);
 
-	priv->layoutcall = NULL;
 	/* g_debug("Root is now: 0x%X", (unsigned int)priv->root); */
 	g_signal_emit(G_OBJECT(client), signals[LAYOUT_UPDATED], 0, TRUE);
 
@@ -681,7 +682,6 @@ dbusmenu_client_new (const gchar * name, const gchar * object)
 	                                     DBUSMENU_CLIENT_PROP_DBUS_NAME, name,
 	                                     DBUSMENU_CLIENT_PROP_DBUS_OBJECT, object,
 	                                     NULL);
-	update_layout(self);
 
 	return self;
 }
-- 
cgit v1.2.3


From 290c64793a50ef7b996a558068b2275ced2cceda Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 26 Jun 2009 11:08:58 -0500
Subject: Switching the loss of the proxies to be warnings instead of errors as
 we can recover from it and handle it gracefully if we need to.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 4308d58..b9a5b90 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -424,7 +424,7 @@ build_proxies (DbusmenuClient * client)
 	                                                  DBUS_INTERFACE_PROPERTIES,
 	                                                  &error);
 	if (error != NULL) {
-		g_error("Unable to get property proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message);
+		g_warning("Unable to get property proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message);
 		g_error_free(error);
 		return;
 	}
@@ -437,7 +437,7 @@ build_proxies (DbusmenuClient * client)
 	                                                  "org.freedesktop.dbusmenu",
 	                                                  &error);
 	if (error != NULL) {
-		g_error("Unable to get dbusmenu proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message);
+		g_warning("Unable to get dbusmenu proxy for %s on %s: %s", priv->dbus_name, priv->dbus_object, error->message);
 		g_error_free(error);
 		return;
 	}
-- 
cgit v1.2.3


From fc6e61d8d731b4cfb7f8e3598893b4805807ffe4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 26 Jun 2009 12:49:52 -0500
Subject: Add the property of the menuitems to check to see if they're the root
 node or not.  Also set that when the layout is being parsed.

---
 libdbusmenu-glib/client.c   |  3 +++
 libdbusmenu-glib/menuitem.c | 41 +++++++++++++++++++++++++++++++++++++++++
 libdbusmenu-glib/menuitem.h |  3 +++
 3 files changed, 47 insertions(+)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index b9a5b90..7319a7f 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -538,6 +538,9 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it
 
 		/* Build a new item */
 		item = dbusmenu_menuitem_new_with_id(id);
+		if (parent == NULL) {
+			dbusmenu_menuitem_set_root(item, TRUE);
+		}
 		g_signal_emit(G_OBJECT(client), signals[NEW_MENUITEM], 0, item, TRUE);
 		/* Get the properties queued up for this item */
 		org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, item);
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 57f1832..8a3d12b 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -39,6 +39,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 	@children: A list of #DbusmenuMenuitem objects that are
 	      children to this one.
 	@properties: All of the properties on this menu item.
+	@root: Whether this node is the root node
 
 	These are the little secrets that we don't want getting
 	out of data that we have.  They can still be gotten using
@@ -50,6 +51,7 @@ struct _DbusmenuMenuitemPrivate
 	guint id;
 	GList * children;
 	GHashTable * properties;
+	gboolean root;
 };
 
 /* Signals */
@@ -197,6 +199,8 @@ dbusmenu_menuitem_init (DbusmenuMenuitem *self)
 	priv->children = NULL;
 
 	priv->properties = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+
+	priv->root = FALSE;
 	
 	return;
 }
@@ -744,6 +748,43 @@ dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi)
 	return ret;
 }
 
+/**
+	dbusmenu_menuitem_set_root:
+	@mi: #DbusmenuMenuitem to set whether it's root
+	@root: Whether @mi is a root node or not
+
+	This function sets the internal value of whether this is a
+	root node or not.
+
+	Return value: None
+*/
+void
+dbusmenu_menuitem_set_root (DbusmenuMenuitem * mi, gboolean root)
+{
+	g_return_if_fail(DBUSMENU_IS_MENUITEM(mi));
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+	priv->root = root;
+	return;
+}
+
+/**
+	dbusmenu_menuitem_get_root:
+	@mi: #DbusmenuMenuitem to see whether it's root
+
+	This function returns the internal value of whether this is a
+	root node or not.
+
+	Return value: #TRUE if this is a root node
+*/
+gboolean
+dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi)
+{
+	g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE);
+	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi);
+	return priv->root;
+}
+
+
 /**
 	dbusmenu_menuitem_buildxml:
 	@mi: #DbusmenuMenuitem to represent in XML
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index bad687b..29865c7 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -123,6 +123,9 @@ gboolean dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gchar *
 GList * dbusmenu_menuitem_properties_list (DbusmenuMenuitem * mi) G_GNUC_WARN_UNUSED_RESULT;
 GHashTable * dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi);
 
+void dbusmenu_menuitem_set_root (DbusmenuMenuitem * mi, gboolean root);
+gboolean dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi);
+
 void dbusmenu_menuitem_buildxml (DbusmenuMenuitem * mi, GPtrArray * array);
 void dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (DbusmenuMenuitem * mi, gpointer data), gpointer data);
 void dbusmenu_menuitem_activate (DbusmenuMenuitem * mi);
-- 
cgit v1.2.3


From 7675f60a41c7a7fe7a4aa9ed853f005798054111 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Fri, 26 Jun 2009 13:57:59 -0500
Subject: Hiding a debug message

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 8a3d12b..aba1f64 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -224,7 +224,7 @@ dbusmenu_menuitem_dispose (GObject *object)
 static void
 dbusmenu_menuitem_finalize (GObject *object)
 {
-	g_debug("Menuitem dying");
+	/* g_debug("Menuitem dying"); */
 	DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(object);
 
 	if (priv->properties != NULL) {
-- 
cgit v1.2.3


From e8393a9d2fd78c79f50ab003de728665f74d4e5e Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 1 Jul 2009 00:36:24 -0500
Subject: Bad prototype for dealing with the new items added signal which also
 has the position in it.  This made it so the server was the position, which
 causes bad stuff to happen.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index cf8ea85..ab5951f 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -86,7 +86,7 @@ static void dbusmenu_server_finalize   (GObject *object);
 static void set_property (GObject * obj, guint id, const GValue * value, GParamSpec * pspec);
 static void get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec);
 static void menuitem_property_changed (DbusmenuMenuitem * mi, gchar * property, gchar * value, DbusmenuServer * server);
-static void menuitem_child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, DbusmenuServer * server);
+static void menuitem_child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint pos, DbusmenuServer * server);
 static void menuitem_child_removed (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, DbusmenuServer * server);
 static void menuitem_signals_create (DbusmenuMenuitem * mi, gpointer data);
 static void menuitem_signals_remove (DbusmenuMenuitem * mi, gpointer data);
@@ -306,7 +306,7 @@ menuitem_property_changed (DbusmenuMenuitem * mi, gchar * property, gchar * valu
 }
 
 static void
-menuitem_child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, DbusmenuServer * server)
+menuitem_child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint pos, DbusmenuServer * server)
 {
 	menuitem_signals_create(child, server);
 	/* TODO: We probably need to group the layout update signals to make the number more reasonble. */
-- 
cgit v1.2.3


From 92f690257a45e81b86b39fc77ce1fe10c7b4908a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Mon, 20 Jul 2009 16:34:39 -0500
Subject: Heh, turns out we need to actually signal people across DBus or
 nothing works.  Who'd a thought.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 7319a7f..212071b 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -515,6 +515,26 @@ menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError
 	return;
 }
 
+static void
+menuitem_call_cb (DBusGProxy * proxy, GError * error, gpointer userdata)
+{
+	DbusmenuMenuitem * mi = (DbusmenuMenuitem *)userdata;
+
+	if (error != NULL) {
+		g_warning("Unable to call menu item %d: %s", dbusmenu_menuitem_get_id(mi), error->message);
+	}
+
+	return;
+}
+
+static void
+menuitem_activate (DbusmenuMenuitem * mi, DbusmenuClient * client)
+{
+	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
+	org_freedesktop_dbusmenu_call_async (priv->menuproxy, dbusmenu_menuitem_get_id(mi), menuitem_call_cb, mi);
+	return;
+}
+
 /* Parse recursively through the XML and make it into
    objects as need be */
 static DbusmenuMenuitem *
@@ -541,6 +561,7 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it
 		if (parent == NULL) {
 			dbusmenu_menuitem_set_root(item, TRUE);
 		}
+		g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(menuitem_activate), client);
 		g_signal_emit(G_OBJECT(client), signals[NEW_MENUITEM], 0, item, TRUE);
 		/* Get the properties queued up for this item */
 		org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_cb, item);
-- 
cgit v1.2.3