From 236ddb030b31aa78842c81fef0cd107a6b615124 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 20 Aug 2009 12:54:53 -0500
Subject: Switching the new signal to be after the properties are gotten and
 adding a hashtable for type handlers.

---
 libdbusmenu-glib/client.c | 34 ++++++++++++++++++++++++++++++++--
 libdbusmenu-glib/client.h | 12 +++++++++---
 2 files changed, 41 insertions(+), 5 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 212071b..9eb8b55 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -68,6 +68,8 @@ struct _DbusmenuClientPrivate
 	DBusGProxyCall * layoutcall;
 
 	DBusGProxy * dbusproxy;
+
+	GHashTable * type_handlers;
 };
 
 #define DBUSMENU_CLIENT_GET_PRIVATE(o) \
@@ -187,6 +189,9 @@ dbusmenu_client_init (DbusmenuClient *self)
 
 	priv->dbusproxy = NULL;
 
+	priv->type_handlers = g_hash_table_new_full(g_str_hash, g_str_equal,
+	                                            g_free, NULL);
+
 	return;
 }
 
@@ -230,6 +235,10 @@ dbusmenu_client_finalize (GObject *object)
 	g_free(priv->dbus_name);
 	g_free(priv->dbus_object);
 
+	if (priv->type_handlers != NULL) {
+		g_hash_table_destroy(priv->type_handlers);
+	}
+
 	G_OBJECT_CLASS (dbusmenu_client_parent_class)->finalize (object);
 	return;
 }
@@ -515,6 +524,22 @@ menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError
 	return;
 }
 
+/* This is a different get properites call back that also sends
+   new signals.  It basically is a small wrapper around the original. */
+static void
+menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data)
+{
+	gpointer * unpackarray = (gpointer *)data;
+
+	menuitem_get_properties_cb (proxy, properties, error, unpackarray[1]);
+
+	g_signal_emit(G_OBJECT(unpackarray[0]), signals[NEW_MENUITEM], 0, unpackarray[1], TRUE);
+
+	g_free(unpackarray);
+
+	return;
+}
+
 static void
 menuitem_call_cb (DBusGProxy * proxy, GError * error, gpointer userdata)
 {
@@ -562,9 +587,14 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it
 			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);
+		/* Not happy about this, but I need both of these :( */
+		gpointer * packarray = g_new0(gpointer, 2);
+		packarray[0] = client;
+		packarray[1] = item;
+
+		org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, packarray);
 	} 
 
 	xmlNodePtr children;
diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index 35f7122..20156d8 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -90,9 +90,15 @@ struct _DbusmenuClient {
 	GObject parent;
 };
 
-GType                dbusmenu_client_get_type   (void);
-DbusmenuClient *     dbusmenu_client_new        (const gchar * name, const gchar * object);
-DbusmenuMenuitem *   dbusmenu_client_get_root   (DbusmenuClient * client);
+typedef void (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent);
+
+GType                dbusmenu_client_get_type          (void);
+DbusmenuClient *     dbusmenu_client_new               (const gchar * name,
+                                                        const gchar * object);
+DbusmenuMenuitem *   dbusmenu_client_get_root          (DbusmenuClient * client);
+gboolean             dbusmenu_client_add_type_handler  (DbusmenuClient * client,
+                                                        const gchar * type,
+                                                        DbusmenuClientTypeHandler newfunc);
 
 /**
 	SECTION:client
-- 
cgit v1.2.3


From 69fe6b5ac33dfd64163d5b41f9a0719b23912e40 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 20 Aug 2009 13:05:24 -0500
Subject: Makin' it so that if we have a type handler we use that, otherwise we
 pass things up.  Also making it so that type handlers can report an error.

---
 libdbusmenu-glib/client.c | 22 ++++++++++++++++++++--
 libdbusmenu-glib/client.h |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 9eb8b55..a4e4f72 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -530,10 +530,27 @@ static void
 menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data)
 {
 	gpointer * unpackarray = (gpointer *)data;
+	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(unpackarray[0]);
 
 	menuitem_get_properties_cb (proxy, properties, error, unpackarray[1]);
 
-	g_signal_emit(G_OBJECT(unpackarray[0]), signals[NEW_MENUITEM], 0, unpackarray[1], TRUE);
+	gboolean handled = FALSE;
+
+	const gchar * type;
+	DbusmenuClientTypeHandler newfunc = NULL;
+	
+	type = dbusmenu_menuitem_property_get(DBUSMENU_MENUITEM(unpackarray[1]), "type");
+	if (type != NULL) {
+		newfunc = g_hash_table_lookup(priv->type_handlers, type);
+	}
+
+	if (newfunc != NULL) {
+		handled = newfunc(DBUSMENU_MENUITEM(unpackarray[1]), DBUSMENU_MENUITEM(unpackarray[2]));
+	}
+
+	if (!handled) {
+		g_signal_emit(G_OBJECT(unpackarray[0]), signals[NEW_MENUITEM], 0, unpackarray[1], TRUE);
+	}
 
 	g_free(unpackarray);
 
@@ -590,9 +607,10 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it
 
 		/* Get the properties queued up for this item */
 		/* Not happy about this, but I need both of these :( */
-		gpointer * packarray = g_new0(gpointer, 2);
+		gpointer * packarray = g_new0(gpointer, 3);
 		packarray[0] = client;
 		packarray[1] = item;
+		packarray[2] = parent;
 
 		org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, packarray);
 	} 
diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index 20156d8..9298d4e 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -90,7 +90,7 @@ struct _DbusmenuClient {
 	GObject parent;
 };
 
-typedef void (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent);
+typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent);
 
 GType                dbusmenu_client_get_type          (void);
 DbusmenuClient *     dbusmenu_client_new               (const gchar * name,
-- 
cgit v1.2.3


From 2a110cf96860653b68d1a165c7e3b7ddb1f993f8 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 20 Aug 2009 13:20:54 -0500
Subject: Making things a little more type safe.  Only one evil cast.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index a4e4f72..5809e1e 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -72,6 +72,14 @@ struct _DbusmenuClientPrivate
 	GHashTable * type_handlers;
 };
 
+typedef struct _newItemPropData newItemPropData;
+struct _newItemPropData
+{
+	DbusmenuClient * client;
+	DbusmenuMenuitem * item;
+	DbusmenuMenuitem * parent;
+};
+
 #define DBUSMENU_CLIENT_GET_PRIVATE(o) \
 (G_TYPE_INSTANCE_GET_PRIVATE ((o), DBUSMENU_TYPE_CLIENT, DbusmenuClientPrivate))
 
@@ -529,30 +537,30 @@ menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError
 static void
 menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data)
 {
-	gpointer * unpackarray = (gpointer *)data;
-	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(unpackarray[0]);
+	newItemPropData * propdata = (newItemPropData *)data;
+	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(propdata->client);
 
-	menuitem_get_properties_cb (proxy, properties, error, unpackarray[1]);
+	menuitem_get_properties_cb (proxy, properties, error, propdata->item);
 
 	gboolean handled = FALSE;
 
 	const gchar * type;
 	DbusmenuClientTypeHandler newfunc = NULL;
 	
-	type = dbusmenu_menuitem_property_get(DBUSMENU_MENUITEM(unpackarray[1]), "type");
+	type = dbusmenu_menuitem_property_get(propdata->item, "type");
 	if (type != NULL) {
 		newfunc = g_hash_table_lookup(priv->type_handlers, type);
 	}
 
 	if (newfunc != NULL) {
-		handled = newfunc(DBUSMENU_MENUITEM(unpackarray[1]), DBUSMENU_MENUITEM(unpackarray[2]));
+		handled = newfunc(propdata->item, propdata->parent);
 	}
 
 	if (!handled) {
-		g_signal_emit(G_OBJECT(unpackarray[0]), signals[NEW_MENUITEM], 0, unpackarray[1], TRUE);
+		g_signal_emit(G_OBJECT(propdata->client), signals[NEW_MENUITEM], 0, propdata->item, TRUE);
 	}
 
-	g_free(unpackarray);
+	g_free(propdata);
 
 	return;
 }
@@ -606,13 +614,13 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it
 		g_signal_connect(G_OBJECT(item), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(menuitem_activate), client);
 
 		/* Get the properties queued up for this item */
-		/* Not happy about this, but I need both of these :( */
-		gpointer * packarray = g_new0(gpointer, 3);
-		packarray[0] = client;
-		packarray[1] = item;
-		packarray[2] = parent;
+		/* Not happy about this, but I need these :( */
+		newItemPropData * propdata = g_new0(newItemPropData, 1);
+		propdata->client  = client;
+		propdata->item    = item;
+		propdata->parent  = parent;
 
-		org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, packarray);
+		org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata);
 	} 
 
 	xmlNodePtr children;
-- 
cgit v1.2.3


From 56f30fa80ae8b832d3d52f247194f90f30ae7dcc Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 25 Aug 2009 11:16:26 -0500
Subject: Creating a realized signal on the menu items.

---
 libdbusmenu-glib/menuitem.c | 17 +++++++++++++++++
 libdbusmenu-glib/menuitem.h |  5 ++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index aba1f64..41c48e2 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -61,6 +61,7 @@ enum {
 	CHILD_ADDED,
 	CHILD_REMOVED,
 	CHILD_MOVED,
+	REALIZED,
 	LAST_SIGNAL
 };
 
@@ -178,6 +179,22 @@ dbusmenu_menuitem_class_init (DbusmenuMenuitemClass *klass)
 	                                           NULL, NULL,
 	                                           _dbusmenu_menuitem_marshal_VOID__OBJECT_UINT_UINT,
 	                                           G_TYPE_NONE, 3, G_TYPE_OBJECT, G_TYPE_UINT, G_TYPE_UINT);
+	/**
+		DbusmenuMenuitem::realized:
+		@arg0: The #DbusmenuMenuitem object.
+
+		Emitted when the initial request for properties
+		is complete on the item.  If there is a type
+		handler configured for the "type" parameter
+		that will be executed before this is signaled.
+	*/
+	signals[REALIZED] =           g_signal_new(DBUSMENU_MENUITEM_SIGNAL_REALIZED,
+	                                           G_TYPE_FROM_CLASS(klass),
+	                                           G_SIGNAL_RUN_LAST,
+	                                           G_STRUCT_OFFSET(DbusmenuMenuitemClass, realized),
+	                                           NULL, NULL,
+	                                           _dbusmenu_menuitem_marshal_VOID__VOID,
+	                                           G_TYPE_NONE, 0, G_TYPE_NONE);
 
 	g_object_class_install_property (object_class, PROP_ID,
 	                                 g_param_spec_uint("id", "ID for the menu item",
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index 29865c7..7704b4a 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -47,6 +47,7 @@ G_BEGIN_DECLS
 #define DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED         "child-added"
 #define DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED       "child-removed"
 #define DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED         "child-moved"
+#define DBUSMENU_MENUITEM_SIGNAL_REALIZED            "realized"
 
 /**
 	DbusmenuMenuitem:
@@ -71,6 +72,7 @@ struct _DbusmenuMenuitem
 	@child_added: Slot for #DbusmenuMenuitem::child-added.
 	@child_removed: Slot for #DbusmenuMenuitem::child-removed.
 	@child_moved: Slot for #DbusmenuMenuitem::child-moved.
+	@realized: Slot for #DbusmenuMenuitem::realized.
 	@buildxml: Virtual function that appends the strings required
 	           to represent this menu item in the menu XML file.
 	@reserved1: Reserved for future use.
@@ -89,6 +91,7 @@ struct _DbusmenuMenuitemClass
 	void (*child_added) (DbusmenuMenuitem * child, guint position);
 	void (*child_removed) (DbusmenuMenuitem * child);
 	void (*child_moved) (DbusmenuMenuitem * child, guint newpos, guint oldpos);
+	void (*realized) (void);
 
 	/* Virtual functions */
 	void (*buildxml) (GPtrArray * stringarray);
@@ -96,7 +99,7 @@ struct _DbusmenuMenuitemClass
 	void (*reserved1) (void);
 	void (*reserved2) (void);
 	void (*reserved3) (void);
-	void (*reserved4) (void);
+	/* void (*reserved4) (void); -- realized, realloc when bumping lib version */
 };
 
 GType dbusmenu_menuitem_get_type (void);
-- 
cgit v1.2.3


From 3136e45a9b1aa56ba8d136df34310ab0891e1a84 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 25 Aug 2009 11:28:13 -0500
Subject: Signaling the realized event after it has all it's parameters.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 5809e1e..4f5922d 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -556,6 +556,8 @@ menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GEr
 		handled = newfunc(propdata->item, propdata->parent);
 	}
 
+	g_signal_emit(G_OBJECT(propdata->item), DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID, 0, TRUE);
+
 	if (!handled) {
 		g_signal_emit(G_OBJECT(propdata->client), signals[NEW_MENUITEM], 0, propdata->item, TRUE);
 	}
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index 7704b4a..0a92153 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -48,6 +48,7 @@ G_BEGIN_DECLS
 #define DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED       "child-removed"
 #define DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED         "child-moved"
 #define DBUSMENU_MENUITEM_SIGNAL_REALIZED            "realized"
+#define DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID         (g_signal_lookup(DBUSMENU_MENUITEM_SIGNAL_REALIZED, DBUSMENU_TYPE_MENUITEM))
 
 /**
 	DbusmenuMenuitem:
-- 
cgit v1.2.3


From c25508f253327fa64fc3dd165480b021273834f4 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 25 Aug 2009 12:09:22 -0500
Subject: Okay, building in some type handlers now.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index 9298d4e..c30f318 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -50,6 +50,10 @@ G_BEGIN_DECLS
 #define DBUSMENU_CLIENT_PROP_DBUS_NAME     "dbus-name"
 #define DBUSMENU_CLIENT_PROP_DBUS_OBJECT   "dbus-object"
 
+#define DBUSMENU_CLIENT_TYPES_DEFAULT      "menuitem"
+#define DBUSMENU_CLIENT_TYPES_SEPERATOR    "seperator"
+#define DBUSMENU_CLIENT_TYPES_IMAGE        "imageitem"
+
 /**
 	DbusmenuClientClass:
 	@parent_class: #GObjectClass
-- 
cgit v1.2.3


From 0d23ee0ce837c23750bdeef3e01c4f117d1250fc Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 25 Aug 2009 14:13:34 -0500
Subject: Switching the prototype for type handlers so that it passes the
 client as well.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 4f5922d..9ac880b 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -553,7 +553,7 @@ menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GEr
 	}
 
 	if (newfunc != NULL) {
-		handled = newfunc(propdata->item, propdata->parent);
+		handled = newfunc(propdata->item, propdata->parent, propdata->client);
 	}
 
 	g_signal_emit(G_OBJECT(propdata->item), DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID, 0, TRUE);
diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index c30f318..b4d214f 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -94,7 +94,7 @@ struct _DbusmenuClient {
 	GObject parent;
 };
 
-typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent);
+typedef gboolean (*DbusmenuClientTypeHandler) (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, DbusmenuClient * client);
 
 GType                dbusmenu_client_get_type          (void);
 DbusmenuClient *     dbusmenu_client_new               (const gchar * name,
-- 
cgit v1.2.3


From 780e2c229e24e20c026219ce6e87533092a172b2 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 25 Aug 2009 14:46:54 -0500
Subject: Forgot some signal documentation.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index b4d214f..563a2e8 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -58,6 +58,7 @@ G_BEGIN_DECLS
 	DbusmenuClientClass:
 	@parent_class: #GObjectClass
 	@layout_updated: Slot for #DbusmenuClient::layout-updated.
+	@new_menuitem: Slot for #DbusmenuClient::new-menuitem.
 	@reserved1: Reserved for future use.
 	@reserved2: Reserved for future use.
 	@reserved3: Reserved for future use.
-- 
cgit v1.2.3


From d5e159567d782bfd8568d9075bea32264f326dff Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 25 Aug 2009 14:47:43 -0500
Subject: It turns out that when you define functions in a header file, they
 don't just write themselves from your thoughts.  Who's supposed to tell me
 these things?  Anyway, now we have a way to register type handlers, like the
 header file said we should.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 9ac880b..c89b44b 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -802,3 +802,46 @@ dbusmenu_client_get_root (DbusmenuClient * client)
 
 	return priv->root;
 }
+
+/**
+	dbusmenu_client_add_type_handler:
+	@client: Client where we're getting types coming in
+	@type: A text string that will be matched with the 'type'
+	    property on incoming menu items
+	@newfunc: The function that will be executed with those new
+	    items when they come in.
+
+	This function connects into the type handling of the #DbusmenuClient.
+	Every new menuitem that comes in immediately gets asked for it's
+	properties.  When we get those properties we check the 'type'
+	property and look to see if it matches a handler that is known
+	by the client.  If so, the @newfunc function is executed on that
+	#DbusmenuMenuitem.  If not, then the DbusmenuClient::new-menuitem
+	signal is sent.
+
+	In the future the known types will be sent to the server so that it
+	can make choices about the menu item types availble.
+
+	Return value: If registering the new type was successful.
+*/
+gboolean
+dbusmenu_client_add_type_handler (DbusmenuClient * client, const gchar * type, DbusmenuClientTypeHandler newfunc)
+{
+	g_return_val_if_fail(DBUSMENU_IS_CLIENT(client), FALSE);
+
+	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
+
+	if (priv->type_handlers) {
+		g_warning("Type handlers hashtable not built");
+		return FALSE;
+	}
+
+	gpointer value = g_hash_table_lookup(priv->type_handlers, type);
+	if (value != NULL) {
+		g_warning("Type '%s' already had a registered handler.", type);
+		return FALSE;
+	}
+
+	g_hash_table_insert(priv->type_handlers, g_strdup(type), newfunc);
+	return TRUE;
+}
-- 
cgit v1.2.3


From 7e5458a267bc02c113c082a8185adf325cf5780d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Tue, 25 Aug 2009 15:47:37 -0500
Subject: Ah, bother.  Check NULL.  Brain fart.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index c89b44b..0a80c6e 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -831,7 +831,7 @@ dbusmenu_client_add_type_handler (DbusmenuClient * client, const gchar * type, D
 
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
 
-	if (priv->type_handlers) {
+	if (priv->type_handlers == NULL) {
 		g_warning("Type handlers hashtable not built");
 		return FALSE;
 	}
-- 
cgit v1.2.3


From 6e80defeeb473bb6df07644a755dcbae72dbf6e1 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 26 Aug 2009 15:15:13 -0500
Subject: Spelling fix.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index 563a2e8..fff9a6b 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -51,7 +51,7 @@ G_BEGIN_DECLS
 #define DBUSMENU_CLIENT_PROP_DBUS_OBJECT   "dbus-object"
 
 #define DBUSMENU_CLIENT_TYPES_DEFAULT      "menuitem"
-#define DBUSMENU_CLIENT_TYPES_SEPERATOR    "seperator"
+#define DBUSMENU_CLIENT_TYPES_SEPARATOR    "separator"
 #define DBUSMENU_CLIENT_TYPES_IMAGE        "imageitem"
 
 /**
-- 
cgit v1.2.3


From 749c283bbaaffff3ca4622ec32df6300ab08b559 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 26 Aug 2009 15:18:50 -0500
Subject: Adding some defines for some common property values.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index 0a92153..7806017 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -50,6 +50,11 @@ G_BEGIN_DECLS
 #define DBUSMENU_MENUITEM_SIGNAL_REALIZED            "realized"
 #define DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID         (g_signal_lookup(DBUSMENU_MENUITEM_SIGNAL_REALIZED, DBUSMENU_TYPE_MENUITEM))
 
+#define DBUSMENU_MENUITEM_PROP_VISIBLE               "visible"
+#define DBUSMENU_MENUITEM_PROP_LABEL                 "label"
+#define DBUSMENU_MENUITEM_PROP_ICON                  "icon"
+#define DBUSMENU_MENUITEM_PROP_ICON_DATA             "icon-data"
+
 /**
 	DbusmenuMenuitem:
 
-- 
cgit v1.2.3


From 9afd4dc68692b573582c3bd57489f9b5a541eb3a Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 26 Aug 2009 15:42:27 -0500
Subject: Adding in a default type handler, incase it's configured, but not set
 by clients.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 0a80c6e..ffde8e3 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -550,6 +550,8 @@ menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GEr
 	type = dbusmenu_menuitem_property_get(propdata->item, "type");
 	if (type != NULL) {
 		newfunc = g_hash_table_lookup(priv->type_handlers, type);
+	} else {
+		newfunc = g_hash_table_lookup(priv->type_handlers, DBUSMENU_CLIENT_TYPES_DEFAULT);
 	}
 
 	if (newfunc != NULL) {
-- 
cgit v1.2.3


From 287122c696ddf0cc0e00a0f7e39663024aaf5e6d Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 27 Aug 2009 08:30:16 -0500
Subject: Comment for Neil.  Checking data.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index ffde8e3..9004f55 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -537,6 +537,8 @@ menuitem_get_properties_cb (DBusGProxy * proxy, GHashTable * properties, GError
 static void
 menuitem_get_properties_new_cb (DBusGProxy * proxy, GHashTable * properties, GError * error, gpointer data)
 {
+	g_return_if_fail(data != NULL);
+
 	newItemPropData * propdata = (newItemPropData *)data;
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(propdata->client);
 
-- 
cgit v1.2.3


From 084decde9945791e7116a16876aabb1788049616 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 27 Aug 2009 08:34:46 -0500
Subject: Check the return of g_new0 for NULL.  Comment by Neil.

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

(limited to 'libdbusmenu-glib')

diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 9004f55..92c7aa9 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -622,11 +622,15 @@ parse_layout_xml(DbusmenuClient * client, xmlNodePtr node, DbusmenuMenuitem * it
 		/* Get the properties queued up for this item */
 		/* Not happy about this, but I need these :( */
 		newItemPropData * propdata = g_new0(newItemPropData, 1);
-		propdata->client  = client;
-		propdata->item    = item;
-		propdata->parent  = parent;
-
-		org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata);
+		if (propdata != NULL) {
+			propdata->client  = client;
+			propdata->item    = item;
+			propdata->parent  = parent;
+
+			org_freedesktop_dbusmenu_get_properties_async(proxy, id, menuitem_get_properties_new_cb, propdata);
+		} else {
+			g_warning("Unable to allocate memory to get properties for menuitem.  This menuitem will never be realized.");
+		}
 	} 
 
 	xmlNodePtr children;
-- 
cgit v1.2.3


From 84c3e9454452203fec2bbff80a25028391360aac Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 27 Aug 2009 08:36:58 -0500
Subject: Making sure that type is not NULL.  Comment from Neil.

---
 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 92c7aa9..dd2254e 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -836,6 +836,7 @@ gboolean
 dbusmenu_client_add_type_handler (DbusmenuClient * client, const gchar * type, DbusmenuClientTypeHandler newfunc)
 {
 	g_return_val_if_fail(DBUSMENU_IS_CLIENT(client), FALSE);
+	g_return_val_if_fail(type != NULL, FALSE);
 
 	DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client);
 
-- 
cgit v1.2.3