Fixing annotations and adding tests with python.

17 files changed, 769 insertions, 658 deletions

diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index e6877b6..92de502 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -122,21 +122,21 @@ if INTROSPECTION_TEN
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
 	--warn-all \
         --add-include-path=$(srcdir) \
-        $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \
+        $(addprefix --c-include=libdbusmenu-glib/, $(libdbusmenu_glibinclude_HEADERS)) \
         --symbol-prefix=dbusmenu \
         --identifier-prefix=Dbusmenu
 else
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
 	--warn-all \
         --add-include-path=$(srcdir) \
-        $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
+        $(addprefix --c-include=libdbusmenu-glib/, $(libdbusmenu_glibinclude_HEADERS))
 endif
 
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 
 if HAVE_INTROSPECTION
 
-introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
+introspection_sources = $(libdbusmenu_glibinclude_HEADERS) $(libdbusmenu_glib_la_SOURCES)
 
 Dbusmenu-0.4.gir: libdbusmenu-glib.la
 Dbusmenu_0_4_gir_INCLUDES = \
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index ba4ae7e..0848294 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -1682,17 +1682,17 @@ update_layout (DbusmenuClient * client)
 
 /* Public API */
 /**
-	dbusmenu_client_new:
-	@name: The DBus name for the server to connect to
-	@object: The object on the server to monitor
-
-	This function creates a new client that connects to a specific
-	server on DBus.  That server is at a specific location sharing
-	a known object.  The interface is assumed by the code to be 
-	the DBus menu interface.  The newly created client will start
-	sending out events as it syncs up with the server.
-
-	Return value: A brand new #DbusmenuClient
+ * dbusmenu_client_new:
+ * @name: The DBus name for the server to connect to
+ * @object: The object on the server to monitor
+ * 
+ * This function creates a new client that connects to a specific
+ * server on DBus.  That server is at a specific location sharing
+ * a known object.  The interface is assumed by the code to be 
+ * the DBus menu interface.  The newly created client will start
+ * sending out events as it syncs up with the server.
+ * 
+ * Return value: A brand new #DbusmenuClient
 */
 DbusmenuClient *
 dbusmenu_client_new (const gchar * name, const gchar * object)
@@ -1706,21 +1706,21 @@ dbusmenu_client_new (const gchar * name, const gchar * object)
 }
 
 /**
-	dbusmenu_client_get_root:
-	@client: The #DbusmenuClient to get the root node from
-
-	Grabs the root node for the specified client @client.  This
-	function may block.  It will block if there is currently a
-	call to update the layout, it will block on that layout 
-	updated and then return the newly updated layout.  Chances
-	are that this update is in the queue for the mainloop as
-	it would have been requested some time ago, but in theory
-	it could block longer.
-
-	Return value: A #DbusmenuMenuitem representing the root of
-		menu on the server.  If there is no server or there is
-		an error receiving its layout it'll return #NULL.
-*/
+ * dbusmenu_client_get_root:
+ * @client: The #DbusmenuClient to get the root node from
+ * 
+ * Grabs the root node for the specified client @client.  This
+ * function may block.  It will block if there is currently a
+ * call to update the layout, it will block on that layout 
+ * updated and then return the newly updated layout.  Chances
+ * are that this update is in the queue for the mainloop as
+ * it would have been requested some time ago, but in theory
+ * it could block longer.
+ * 
+ * Return value: (transfer none): A #DbusmenuMenuitem representing the root of
+ * 	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)
 {
@@ -1749,25 +1749,25 @@ type_handler_destroy (gpointer user_data)
 }
 
 /**
-	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.
+ * 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)
@@ -1776,29 +1776,29 @@ dbusmenu_client_add_type_handler (DbusmenuClient * client, const gchar * type, D
 }
 
 /**
-	dbusmenu_client_add_type_handler_full:
-	@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.
-	@user_data: Data passed to @newfunc when it is called
-	@destroy_func: A function that is called when the type handler is
-		removed (usually on client destruction) which will free
-		the resources in @user_data.
-
-	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.
+ * dbusmenu_client_add_type_handler_full:
+ * @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.
+ * @user_data: Data passed to @newfunc when it is called
+ * @destroy_func: A function that is called when the type handler is
+ * 	removed (usually on client destruction) which will free
+ * 	the resources in @user_data.
+ * 
+ * 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_full (DbusmenuClient * client, const gchar * type, DbusmenuClientTypeHandler newfunc, gpointer user_data, DbusmenuClientTypeDestroyHandler destroy_func)
diff --git a/libdbusmenu-glib/client.h b/libdbusmenu-glib/client.h
index 6d78edf..79c0ee2 100644
--- a/libdbusmenu-glib/client.h
+++ b/libdbusmenu-glib/client.h
@@ -145,7 +145,7 @@ gboolean             dbusmenu_client_add_type_handler_full (DbusmenuClient * cli
                                                         const gchar * type,
                                                         DbusmenuClientTypeHandler newfunc,
                                                         gpointer user_data,
-                                                        DbusmenuClientTypeDestroyHandler destory_func);
+                                                        DbusmenuClientTypeDestroyHandler destroy_func);
 void                 dbusmenu_client_send_event        (DbusmenuClient * client,
                                                         gint id,
                                                         const gchar * name,
diff --git a/libdbusmenu-glib/menuitem-proxy.c b/libdbusmenu-glib/menuitem-proxy.c
index 1d97c4c..ae6a334 100644
--- a/libdbusmenu-glib/menuitem-proxy.c
+++ b/libdbusmenu-glib/menuitem-proxy.c
@@ -325,14 +325,14 @@ remove_menuitem (DbusmenuMenuitemProxy * pmi)
 }
 
 /**
-	dbusmenu_menuitem_proxy_new:
-	@mi: The #DbusmenuMenuitem to proxy
-
-	Builds a new #DbusmenuMenuitemProxy object that proxies
-	all of the values for @mi.
-
-	Return value: A new #DbusmenuMenuitemProxy object.
-*/
+ * dbusmenu_menuitem_proxy_new:
+ * @mi: The #DbusmenuMenuitem to proxy
+ * 
+ * Builds a new #DbusmenuMenuitemProxy object that proxies
+ * all of the values for @mi.
+ * 
+ * Return value: A new #DbusmenuMenuitemProxy object.
+ */
 DbusmenuMenuitemProxy *
 dbusmenu_menuitem_proxy_new (DbusmenuMenuitem * mi)
 {
@@ -344,15 +344,15 @@ dbusmenu_menuitem_proxy_new (DbusmenuMenuitem * mi)
 }
 
 /**
-	dbusmenu_menuitem_proxy_get_wrapped:
-	@pmi: #DbusmenuMenuitemProxy to look into
-
-	Accesses the private variable of which #DbusmenuMenuitem
-	we are doing the proxying for.
-
-	Return value: A #DbusmenuMenuitem object or a #NULL if we
-		don't have one or there is an error.
-*/
+ * dbusmenu_menuitem_proxy_get_wrapped:
+ * @pmi: #DbusmenuMenuitemProxy to look into
+ * 
+ * Accesses the private variable of which #DbusmenuMenuitem
+ * we are doing the proxying for.
+ * 
+ * Return value: (transfer none): A #DbusmenuMenuitem object or a #NULL if we
+ * 	don't have one or there is an error.
+ */
 DbusmenuMenuitem *
 dbusmenu_menuitem_proxy_get_wrapped (DbusmenuMenuitemProxy * pmi)
 {
diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 54d2540..c994130 100644
--- a/libdbusmenu-glib/menuitem.c
+++ b/libdbusmenu-glib/menuitem.c
@@ -95,7 +95,7 @@ static void set_property (GObject * obj, guint id, const GValue * value, GParamS
 static void get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec);
 static void g_value_transform_STRING_BOOLEAN (const GValue * in, GValue * out);
 static void g_value_transform_STRING_INT (const GValue * in, GValue * out);
-static void handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
+static void handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp);
 static void send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 /* GObject stuff */
@@ -428,12 +428,12 @@ send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gp
 /* Public interface */
 
 /**
-	dbusmenu_menuitem_new:
-
-	Create a new #DbusmenuMenuitem with all default values.
-
-	Return value: A newly allocated #DbusmenuMenuitem.
-*/
+ * dbusmenu_menuitem_new:
+ * 
+ * Create a new #DbusmenuMenuitem with all default values.
+ * 
+ * Return value: A newly allocated #DbusmenuMenuitem.
+ */
 DbusmenuMenuitem *
 dbusmenu_menuitem_new (void)
 {
@@ -441,13 +441,13 @@ dbusmenu_menuitem_new (void)
 }
 
 /**
-	dbusmenu_menuitem_new_with_id:
-	@id: ID to use for this menuitem
-
-	This creates a blank #DbusmenuMenuitem with a specific ID.
-
-	Return value: A newly allocated #DbusmenuMenuitem.
-*/
+ * dbusmenu_menuitem_new_with_id:
+ * @id: ID to use for this menuitem
+ * 
+ * This creates a blank #DbusmenuMenuitem with a specific ID.
+ * 
+ * Return value: A newly allocated #DbusmenuMenuitem.
+ */
 DbusmenuMenuitem *
 dbusmenu_menuitem_new_with_id (gint id)
 {
@@ -457,13 +457,13 @@ dbusmenu_menuitem_new_with_id (gint id)
 }
 
 /**
-	dbusmenu_menuitem_get_id:
-	@mi: The #DbusmenuMenuitem to query.
-
-	Gets the unique ID for @mi.
-
-	Return value: The ID of the @mi.
-*/
+ * dbusmenu_menuitem_get_id:
+ * @mi: The #DbusmenuMenuitem to query.
+ * 
+ * Gets the unique ID for @mi.
+ * 
+ * Return value: The ID of the @mi.
+ */
 gint
 dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi)
 {
@@ -480,17 +480,17 @@ dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi)
 }
 
 /**
-	dbusmenu_menuitem_realized:
-	@mi: #DbusmenuMenuitem to check on
-
-	This function returns whether the menuitem has been realized or
-	not.  This is significant mostly in client implementations that
-	can use this additional state to see if the second layers of
-	the implementation have been built yet.
-
-	Return value: Returns whether or not the menu item has been realized
-		yet or not.
-*/
+ * dbusmenu_menuitem_realized:
+ * @mi: #DbusmenuMenuitem to check on
+ * 
+ * This function returns whether the menuitem has been realized or
+ * not.  This is significant mostly in client implementations that
+ * can use this additional state to see if the second layers of
+ * the implementation have been built yet.
+ * 
+ * Return value: Returns whether or not the menu item has been realized
+ * 	yet or not.
+ */
 gboolean
 dbusmenu_menuitem_realized (DbusmenuMenuitem * mi)
 {
@@ -500,12 +500,12 @@ dbusmenu_menuitem_realized (DbusmenuMenuitem * mi)
 }
 
 /**
-	dbusmenu_menuitem_set_realized:
-	@mi: #DbusmenuMenuitem to realize
-
-	Sets the internal variable tracking whether it's been realized and
-	signals the DbusmenuMenuitem::realized event.
-*/
+ * dbusmenu_menuitem_set_realized:
+ * @mi: #DbusmenuMenuitem to realize
+ * 
+ * Sets the internal variable tracking whether it's been realized and
+ * signals the DbusmenuMenuitem::realized event.
+ */
 void
 dbusmenu_menuitem_set_realized (DbusmenuMenuitem * mi)
 {
@@ -520,15 +520,15 @@ dbusmenu_menuitem_set_realized (DbusmenuMenuitem * mi)
 }
 
 /**
-	dbusmenu_menuitem_get_children:
-	@mi: The #DbusmenuMenuitem to query.
-
-	Returns simply the list of children that this menu item
-	has.  The list is valid until another child related function
-	is called, where it might be changed.
-
-	Return value: A #GList of pointers to #DbusmenuMenuitem objects.
-*/
+ * dbusmenu_menuitem_get_children:
+ * @mi: The #DbusmenuMenuitem to query.
+ * 
+ * Returns simply the list of children that this menu item
+ * has.  The list is valid until another child related function
+ * is called, where it might be changed.
+ * 
+ * Return value: (transfer none): A #GList of pointers to #DbusmenuMenuitem objects.
+ */
 GList *
 dbusmenu_menuitem_get_children (DbusmenuMenuitem * mi)
 {
@@ -551,18 +551,18 @@ take_children_signal (gpointer data, gpointer user_data)
 }
 
 /**
-	dbusmenu_menuitem_take_children:
-	@mi: The #DbusmenMenuitem to take the children from.
-
-	While the name sounds devious that's exactly what this function
-	does.  It takes the list of children from the @mi and clears the
-	internal list.  The calling function is now in charge of the ref's
-	on the children it has taken.  A lot of responsibility involved
-	in taking children.
-
-	Return value: (transfer full) (array) (element-type Dbusmenu.Menuitem)
-	A #GList of pointers to #DbusmenuMenuitem objects.
-*/
+ * dbusmenu_menuitem_take_children:
+ * @mi: The #DbusmenMenuitem to take the children from.
+ * 
+ * While the name sounds devious that's exactly what this function
+ * does.  It takes the list of children from the @mi and clears the
+ * internal list.  The calling function is now in charge of the ref's
+ * on the children it has taken.  A lot of responsibility involved
+ * in taking children.
+ * 
+ * Return value: (transfer full) (element-type Dbusmenu.Menuitem):
+ *    A #GList of pointers to #DbusmenuMenuitem objects.
+ */
 GList *
 dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi)
 {
@@ -579,16 +579,16 @@ dbusmenu_menuitem_take_children (DbusmenuMenuitem * mi)
 }
 
 /**
-	dbusmenu_menuitem_get_position:
-	@mi: The #DbusmenuMenuitem to find the position of
-	@parent: The #DbusmenuMenuitem who's children contain @mi
-
-	This function returns the position of the menu item @mi
-	in the children of @parent.  It will return zero if the
-	menu item can't be found.
-
-	Return value: The position of @mi in the children of @parent.
-*/
+ * dbusmenu_menuitem_get_position:
+ * @mi: The #DbusmenuMenuitem to find the position of
+ * @parent: The #DbusmenuMenuitem who's children contain @mi
+ * 
+ * This function returns the position of the menu item @mi
+ * in the children of @parent.  It will return zero if the
+ * menu item can't be found.
+ * 
+ * Return value: The position of @mi in the children of @parent.
+ */
 guint
 dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent)
 {
@@ -618,15 +618,15 @@ dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent
 }
 
 /**
-	dbusmenu_menuitem_get_position_realized:
-	@mi: The #DbusmenuMenuitem to find the position of
-	@parent: The #DbusmenuMenuitem who's children contain @mi
-
-	This function is very similar to #dbusmenu_menuitem_get_position
-	except that it only counts in the children that have been realized.
-
-	Return value: The position of @mi in the realized children of @parent.
-*/
+ * dbusmenu_menuitem_get_position_realized:
+ * @mi: The #DbusmenuMenuitem to find the position of
+ * @parent: The #DbusmenuMenuitem who's children contain @mi
+ * 
+ * This function is very similar to #dbusmenu_menuitem_get_position
+ * except that it only counts in the children that have been realized.
+ * 
+ * Return value: The position of @mi in the realized children of @parent.
+ */
 guint
 dbusmenu_menuitem_get_position_realized (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent)
 {
@@ -662,15 +662,15 @@ dbusmenu_menuitem_get_position_realized (DbusmenuMenuitem * mi, DbusmenuMenuitem
 }
 
 /**
-	dbusmenu_menuitem_child_append:
-	@mi: The #DbusmenuMenuitem which will become a new parent
-	@child: The #DbusmenMenuitem that will be a child
-
-	This function adds @child to the list of children on @mi at
-	the end of that list.
-
-	Return value: Whether the child has been added successfully.
-*/
+ * dbusmenu_menuitem_child_append:
+ * @mi: The #DbusmenuMenuitem which will become a new parent
+ * @child: The #DbusmenMenuitem that will be a child
+ * 
+ * This function adds @child to the list of children on @mi at
+ * the end of that list.
+ * 
+ * Return value: Whether the child has been added successfully.
+ */
 gboolean
 dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 {
@@ -694,15 +694,15 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 }
 
 /**
-	dbusmenu_menuitem_child_prepend:
-	@mi: The #DbusmenuMenuitem which will become a new parent
-	@child: The #DbusmenMenuitem that will be a child
-
-	This function adds @child to the list of children on @mi at
-	the beginning of that list.
-
-	Return value: Whether the child has been added successfully.
-*/
+ * dbusmenu_menuitem_child_prepend:
+ * @mi: The #DbusmenuMenuitem which will become a new parent
+ * @child: The #DbusmenMenuitem that will be a child
+ * 
+ * This function adds @child to the list of children on @mi at
+ * the beginning of that list.
+ * 
+ * Return value: Whether the child has been added successfully.
+ */
 gboolean
 dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 {
@@ -726,16 +726,16 @@ dbusmenu_menuitem_child_prepend (DbusmenuMenuitem * mi, DbusmenuMenuitem * child
 }
 
 /**
-	dbusmenu_menuitem_child_delete:
-	@mi: The #DbusmenuMenuitem which has @child as a child
-	@child: The child #DbusmenuMenuitem that you want to no longer
-	    be a child of @mi.
-	
-	This function removes @child from the children list of @mi.  It does
-	not call #g_object_unref on @child.
-
-	Return value: If we were able to delete @child.
-*/
+ * dbusmenu_menuitem_child_delete:
+ * @mi: The #DbusmenuMenuitem which has @child as a child
+ * @child: The child #DbusmenuMenuitem that you want to no longer
+ *     be a child of @mi.
+ * 
+ * This function removes @child from the children list of @mi.  It does
+ * not call #g_object_unref on @child.
+ * 
+ * Return value: If we were able to delete @child.
+ */
 gboolean
 dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 {
@@ -758,17 +758,17 @@ dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child)
 }
 
 /**
-	dbusmenu_menuitem_child_add_position:
-	@mi: The #DbusmenuMenuitem that we're adding the child @child to.
-	@child: The #DbusmenuMenuitem to make a child of @mi.
-	@position: Where in @mi object's list of chidren @child should be placed.
-
-	Puts @child in the list of children for @mi at the location
-	specified in @position.  If there is not enough entires available
-	then @child will be placed at the end of the list.
-
-	Return value: Whether @child was added successfully.
-*/
+ * dbusmenu_menuitem_child_add_position:
+ * @mi: The #DbusmenuMenuitem that we're adding the child @child to.
+ * @child: The #DbusmenuMenuitem to make a child of @mi.
+ * @position: Where in @mi object's list of chidren @child should be placed.
+ * 
+ * Puts @child in the list of children for @mi at the location
+ * specified in @position.  If there is not enough entires available
+ * then @child will be placed at the end of the list.
+ * 
+ * Return value: Whether @child was added successfully.
+ */
 gboolean
 dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position)
 {
@@ -792,17 +792,17 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem *
 }
 
 /**
-	dbusmenu_menuitem_child_reorder:
-	@base: The #DbusmenuMenuitem that has children needing realignment
-	@child: The #DbusmenuMenuitem that is a child needing to be moved
-	@position: The position in the list to place it in
-
-	This function moves a child on the list of children.  It is
-	for a child that is already in the list, but simply needs a 
-	new location.
-
-	Return value: Whether the move was successful.
-*/
+ * dbusmenu_menuitem_child_reorder:
+ * @mi: The #DbusmenuMenuitem that has children needing realignment
+ * @child: The #DbusmenuMenuitem that is a child needing to be moved
+ * @position: The position in the list to place it in
+ * 
+ * This function moves a child on the list of children.  It is
+ * for a child that is already in the list, but simply needs a 
+ * new location.
+ * 
+ * Return value: Whether the move was successful.
+ */
 gboolean
 dbusmenu_menuitem_child_reorder(DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position)
 {
@@ -832,16 +832,16 @@ dbusmenu_menuitem_child_reorder(DbusmenuMenuitem * mi, DbusmenuMenuitem * child,
 }
 
 /**
-	dbusmenu_menuitem_child_find:
-	@mi: The #DbusmenuMenuitem who's children to look on
-	@id: The ID of the child that we're looking for.
-
-	Search the children of @mi to find one with the ID of @id.
-	If it doesn't exist then we return #NULL.
-
-	Return value: The menu item with the ID @id or #NULL if it
-	   can't be found.
-*/
+ * dbusmenu_menuitem_child_find:
+ * @mi: The #DbusmenuMenuitem who's children to look on
+ * @id: The ID of the child that we're looking for.
+ * 
+ * Search the children of @mi to find one with the ID of @id.
+ * If it doesn't exist then we return #NULL.
+ * 
+ * Return value: (transfer none): The menu item with the ID @id or #NULL if it
+ *    can't be found.
+ */
 DbusmenuMenuitem *
 dbusmenu_menuitem_child_find (DbusmenuMenuitem * mi, gint id)
 {
@@ -885,18 +885,18 @@ find_id_helper (gpointer in_mi, gpointer in_find_id)
 }
 
 /**
-	dbusmenu_menuitem_find_id:
-	@mi: #DbusmenuMenuitem at the top of the tree to search
-	@id: ID of the #DbusmenuMenuitem to search for
-
-	This function searchs the whole tree of children that
-	are attached to @mi.  This could be quite a few nodes, all
-	the way down the tree.  It is a depth first search.
-
-	Return value: The #DbusmenuMenuitem with the ID of @id
-		or #NULL if there isn't such a menu item in the tree
-		represented by @mi.
-*/
+ * dbusmenu_menuitem_find_id:
+ * @mi: #DbusmenuMenuitem at the top of the tree to search
+ * @id: ID of the #DbusmenuMenuitem to search for
+ * 
+ * This function searchs the whole tree of children that
+ * are attached to @mi.  This could be quite a few nodes, all
+ * the way down the tree.  It is a depth first search.
+ * 
+ * Return value: (transfer none): The #DbusmenuMenuitem with the ID of @id
+ * 	or #NULL if there isn't such a menu item in the tree
+ * 	represented by @mi.
+ */
 DbusmenuMenuitem *
 dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint id)
 {
@@ -913,20 +913,20 @@ dbusmenu_menuitem_find_id (DbusmenuMenuitem * mi, gint id)
 }
 
 /**
-	dbusmenu_menuitem_property_set:
-	@mi: The #DbusmenuMenuitem to set the property on.
-	@property: Name of the property to set.
-	@value: The value of the property.
-
-	Takes the pair of @property and @value and places them as a
-	property on @mi.  If a property already exists by that name,
-	then the value is set to the new value.  If not, the property
-	is added.  If the value is changed or the property was previously
-	unset then the signal #DbusmenuMenuitem::prop-changed will be
-	emitted by this function.
-
-	Return value:  A boolean representing if the property value was set.
-*/
+ * dbusmenu_menuitem_property_set:
+ * @mi: The #DbusmenuMenuitem to set the property on.
+ * @property: Name of the property to set.
+ * @value: The value of the property.
+ * 
+ * Takes the pair of @property and @value and places them as a
+ * property on @mi.  If a property already exists by that name,
+ * then the value is set to the new value.  If not, the property
+ * is added.  If the value is changed or the property was previously
+ * unset then the signal #DbusmenuMenuitem::prop-changed will be
+ * emitted by this function.
+ * 
+ * Return value:  A boolean representing if the property value was set.
+ */
 gboolean
 dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, const gchar * value)
 {
@@ -938,20 +938,20 @@ dbusmenu_menuitem_property_set (DbusmenuMenuitem * mi, const gchar * property, c
 }
 
 /**
-	dbusmenu_menuitem_property_set_bool:
-	@mi: The #DbusmenuMenuitem to set the property on.
-	@property: Name of the property to set.
-	@value: The value of the property.
-
-	Takes a boolean @value and sets it on @property as a
-	property on @mi.  If a property already exists by that name,
-	then the value is set to the new value.  If not, the property
-	is added.  If the value is changed or the property was previously
-	unset then the signal #DbusmenuMenuitem::prop-changed will be
-	emitted by this function.
-
-	Return value:  A boolean representing if the property value was set.
-*/
+ * dbusmenu_menuitem_property_set_bool:
+ * @mi: The #DbusmenuMenuitem to set the property on.
+ * @property: Name of the property to set.
+ * @value: The value of the property.
+ * 
+ * Takes a boolean @value and sets it on @property as a
+ * property on @mi.  If a property already exists by that name,
+ * then the value is set to the new value.  If not, the property
+ * is added.  If the value is changed or the property was previously
+ * unset then the signal #DbusmenuMenuitem::prop-changed will be
+ * emitted by this function.
+ * 
+ * Return value:  A boolean representing if the property value was set.
+ */
 gboolean
 dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * property, const gboolean value)
 {
@@ -960,20 +960,20 @@ dbusmenu_menuitem_property_set_bool (DbusmenuMenuitem * mi, const gchar * proper
 }
 
 /**
-	dbusmenu_menuitem_property_set_int:
-	@mi: The #DbusmenuMenuitem to set the property on.
-	@property: Name of the property to set.
-	@value: The value of the property.
-
-	Takes a boolean @value and sets it on @property as a
-	property on @mi.  If a property already exists by that name,
-	then the value is set to the new value.  If not, the property
-	is added.  If the value is changed or the property was previously
-	unset then the signal #DbusmenuMenuitem::prop-changed will be
-	emitted by this function.
-
-	Return value:  A boolean representing if the property value was set.
-*/
+ * dbusmenu_menuitem_property_set_int:
+ * @mi: The #DbusmenuMenuitem to set the property on.
+ * @property: Name of the property to set.
+ * @value: The value of the property.
+ * 
+ * Takes a boolean @value and sets it on @property as a
+ * property on @mi.  If a property already exists by that name,
+ * then the value is set to the new value.  If not, the property
+ * is added.  If the value is changed or the property was previously
+ * unset then the signal #DbusmenuMenuitem::prop-changed will be
+ * emitted by this function.
+ * 
+ * Return value:  A boolean representing if the property value was set.
+ */
 gboolean
 dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * property, const gint value)
 {
@@ -982,20 +982,20 @@ dbusmenu_menuitem_property_set_int (DbusmenuMenuitem * mi, const gchar * propert
 }
 
 /**
-	dbusmenu_menuitem_property_set_variant:
-	@mi: The #DbusmenuMenuitem to set the property on.
-	@property: Name of the property to set.
-	@value: The value of the property.
-
-	Takes the pair of @property and @value and places them as a
-	property on @mi.  If a property already exists by that name,
-	then the value is set to the new value.  If not, the property
-	is added.  If the value is changed or the property was previously
-	unset then the signal #DbusmenuMenuitem::prop-changed will be
-	emitted by this function.
-
-	Return value:  A boolean representing if the property value was set.
-*/
+ * dbusmenu_menuitem_property_set_variant:
+ * @mi: The #DbusmenuMenuitem to set the property on.
+ * @property: Name of the property to set.
+ * @value: The value of the property.
+ * 
+ * Takes the pair of @property and @value and places them as a
+ * property on @mi.  If a property already exists by that name,
+ * then the value is set to the new value.  If not, the property
+ * is added.  If the value is changed or the property was previously
+ * unset then the signal #DbusmenuMenuitem::prop-changed will be
+ * emitted by this function.
+ * 
+ * Return value:  A boolean representing if the property value was set.
+ */
 gboolean
 dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * property, GVariant * value)
 {
@@ -1034,18 +1034,18 @@ dbusmenu_menuitem_property_set_variant (DbusmenuMenuitem * mi, const gchar * pro
 }
 
 /**
-	dbusmenu_menuitem_property_get:
-	@mi: The #DbusmenuMenuitem to look for the property on.
-	@property: The property to grab.
-
-	Look up a property on @mi and return the value of it if
-	it exits.  #NULL will be returned if the property doesn't
-	exist.
-
-	Return value: A string with the value of the property
-		that shouldn't be free'd.  Or #NULL if the property
-		is not set or is not a string.
-*/
+ * dbusmenu_menuitem_property_get:
+ * @mi: The #DbusmenuMenuitem to look for the property on.
+ * @property: The property to grab.
+ * 
+ * Look up a property on @mi and return the value of it if
+ * it exits.  #NULL will be returned if the property doesn't
+ * exist.
+ * 
+ * Return value: (transfer none): A string with the value of the property
+ * 	that shouldn't be free'd.  Or #NULL if the property
+ * 	is not set or is not a string.
+ */
 const gchar *
 dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1056,16 +1056,16 @@ dbusmenu_menuitem_property_get (DbusmenuMenuitem * mi, const gchar * property)
 }
 
 /**
-	dbusmenu_menuitem_property_get_variant:
-	@mi: The #DbusmenuMenuitem to look for the property on.
-	@property: The property to grab.
-
-	Look up a property on @mi and return the value of it if
-	it exits.  #NULL will be returned if the property doesn't
-	exist.
-
-	Return value: A GVariant for the property.
-*/
+ * dbusmenu_menuitem_property_get_variant:
+ * @mi: The #DbusmenuMenuitem to look for the property on.
+ * @property: The property to grab.
+ * 
+ * Look up a property on @mi and return the value of it if
+ * it exits.  #NULL will be returned if the property doesn't
+ * exist.
+ * 
+ * Return value: (transfer none): A GVariant for the property.
+ */
 GVariant *
 dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1078,15 +1078,15 @@ dbusmenu_menuitem_property_get_variant (DbusmenuMenuitem * mi, const gchar * pro
 }
 
 /**
-	dbusmenu_menuitem_property_get_bool:
-	@mi: The #DbusmenuMenuitem to look for the property on.
-	@property: The property to grab.
-
-	Look up a property on @mi and return the value of it if
-	it exits.  Returns #FALSE if the property doesn't exist.
-
-	Return value: The value of the property or #FALSE.
-*/
+ * dbusmenu_menuitem_property_get_bool:
+ * @mi: The #DbusmenuMenuitem to look for the property on.
+ * @property: The property to grab.
+ * 
+ * Look up a property on @mi and return the value of it if
+ * it exits.  Returns #FALSE if the property doesn't exist.
+ * 
+ * Return value: The value of the property or #FALSE.
+ */
 gboolean
 dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1112,15 +1112,15 @@ dbusmenu_menuitem_property_get_bool (DbusmenuMenuitem * mi, const gchar * proper
 }
 
 /**
-	dbusmenu_menuitem_property_get_int:
-	@mi: The #DbusmenuMenuitem to look for the property on.
-	@property: The property to grab.
-
-	Look up a property on @mi and return the value of it if
-	it exits.  Returns zero if the property doesn't exist.
-
-	Return value: The value of the property or zero.
-*/
+ * dbusmenu_menuitem_property_get_int:
+ * @mi: The #DbusmenuMenuitem to look for the property on.
+ * @property: The property to grab.
+ * 
+ * Look up a property on @mi and return the value of it if
+ * it exits.  Returns zero if the property doesn't exist.
+ * 
+ * Return value: The value of the property or zero.
+ */
 gint
 dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1142,15 +1142,15 @@ dbusmenu_menuitem_property_get_int (DbusmenuMenuitem * mi, const gchar * propert
 
 
 /**
-	dbusmenu_menuitem_property_exit:
-	@mi: The #DbusmenuMenuitem to look for the property on.
-	@property: The property to look for.
-
-	Checkes to see if a particular property exists on @mi and 
-	returns #TRUE if so.
-
-	Return value: A boolean checking to see if the property is available
-*/
+ * dbusmenu_menuitem_property_exit:
+ * @mi: The #DbusmenuMenuitem to look for the property on.
+ * @property: The property to look for.
+ * 
+ * Checkes to see if a particular property exists on @mi and 
+ * returns #TRUE if so.
+ * 
+ * Return value: A boolean checking to see if the property is available
+ */
 gboolean
 dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1165,12 +1165,12 @@ dbusmenu_menuitem_property_exist (DbusmenuMenuitem * mi, const gchar * property)
 }
 
 /**
-	dbusmenu_menuitem_property_remove:
-	@mi: The #DbusmenuMenuitem to remove the property on.
-	@property: The property to look for.
-
-	Removes a property from the menuitem.
-*/
+ * dbusmenu_menuitem_property_remove:
+ * @mi: The #DbusmenuMenuitem to remove the property on.
+ * @property: The property to look for.
+ * 
+ * Removes a property from the menuitem.
+ */
 void
 dbusmenu_menuitem_property_remove (DbusmenuMenuitem * mi, const gchar * property)
 {
@@ -1185,15 +1185,16 @@ dbusmenu_menuitem_property_remove (DbusmenuMenuitem * mi, const gchar * property
 }
 
 /**
-	dbusmenu_menuitem_properties_list:
-	@mi: #DbusmenuMenuitem to list the properties on
-
-	This functiong gets a list of the names of all the properties
-	that are set on this menu item.  This data on the list is owned
-	by the menuitem but the list is not and should be freed using
-	g_list_free() when the calling function is done with it.
-
-	Return value: A list of strings or NULL if there are none.
+ * dbusmenu_menuitem_properties_list:
+ * @mi: #DbusmenuMenuitem to list the properties on
+ * 
+ * This functiong gets a list of the names of all the properties
+ * that are set on this menu item.  This data on the list is owned
+ * by the menuitem but the list is not and should be freed using
+ * g_list_free() when the calling function is done with it.
+ * 
+ * Return value: (transfer container): A list of strings or NULL if there are
+ *     none.
 */
 GList *
 dbusmenu_menuitem_properties_list (DbusmenuMenuitem * mi)
@@ -1219,18 +1220,18 @@ copy_helper (gpointer in_key, gpointer in_value, gpointer in_data)
 }
 
 /**
-	dbusmenu_menuitem_properties_copy:
-	@mi: #DbusmenuMenuitem that we're interested in the properties of
-
-	This function takes the properties of a #DbusmenuMenuitem
-	and puts them into a #GHashTable that is referenced by the
-	key of a string and has the value of a string.  The hash
-	table may not have any entries if there aren't any or there
-	is an error in processing.  It is the caller's responsibility
-	to destroy the created #GHashTable.
-
-	Return value: A brand new #GHashTable that contains all of the
-		properties that are on this #DbusmenuMenuitem @mi.
+ * dbusmenu_menuitem_properties_copy:
+ * @mi: #DbusmenuMenuitem that we're interested in the properties of
+ * 
+ * This function takes the properties of a #DbusmenuMenuitem
+ * and puts them into a #GHashTable that is referenced by the
+ * key of a string and has the value of a string.  The hash
+ * table may not have any entries if there aren't any or there
+ * is an error in processing.  It is the caller's responsibility
+ * to destroy the created #GHashTable.
+ * 
+ * Return value: (transfer full): A brand new #GHashTable that contains all of
+ *    theroperties that are on this #DbusmenuMenuitem @mi.
 */
 GHashTable *
 dbusmenu_menuitem_properties_copy (DbusmenuMenuitem * mi)
@@ -1257,14 +1258,14 @@ variant_helper (gpointer in_key, gpointer in_value, gpointer user_data)
 }
 
 /**
-	dbusmenu_menuitem_properties_variant:
-	@mi: #DbusmenuMenuitem to get properties from
-
-	Grabs the properties of the menuitem as a GVariant with the
-	type "a{sv}".
-
-	Return Value: A GVariant of type "a{sv}" or NULL on error.
-*/
+ * dbusmenu_menuitem_properties_variant:
+ * @mi: #DbusmenuMenuitem to get properties from
+ * 
+ * Grabs the properties of the menuitem as a GVariant with the
+ * type "a{sv}".
+ * 
+ * Return Value: (transfer full): A GVariant of type "a{sv}" or NULL on error.
+ */
 GVariant *
 dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi, const gchar ** properties)
 {
@@ -1287,15 +1288,15 @@ dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi, const gchar ** prop
 }
 
 /**
-	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
-*/
+ * 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)
 {
@@ -1306,14 +1307,14 @@ dbusmenu_menuitem_set_root (DbusmenuMenuitem * mi, gboolean root)
 }
 
 /**
-	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
-*/
+ * 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)
 {
@@ -1324,15 +1325,17 @@ dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi)
 
 
 /**
-	dbusmenu_menuitem_buildvariant:
-	@mi: #DbusmenuMenuitem to represent in XML
-	@array: (element-type utf8): A list of string that will be turned into an XML file
-
-	This function will add strings to the array @array.  It will put
-	at least one entry if this menu item has no children.  If it has
-	children it will put two for this entry, one representing the
-	start tag and one that is a closing tag.  It will allow it's
-	children to place their own tags in the array in between those two.
+ * dbusmenu_menuitem_buildvariant:
+ * @mi: #DbusmenuMenuitem to represent in a variant
+ * @properties: (element-type utf8): A list of string that will be put into
+ *      a variant
+ * 
+ * This function will put at least one entry if this menu item has no children.
+ * If it has children it will put two for this entry, one representing the
+ * start tag and one that is a closing tag.  It will allow it's
+ * children to place their own tags in the array in between those two.
+ *
+ * Return value: (transfer full): Variant representing @properties
 */
 GVariant *
 dbusmenu_menuitem_build_variant (DbusmenuMenuitem * mi, const gchar ** properties, gint recurse)
@@ -1393,15 +1396,15 @@ foreach_helper (gpointer data, gpointer user_data)
 }
 
 /**
-	dbusmenu_menuitem_foreach:
-	@mi: The #DbusmenItem to start from
-	@func: Function to call on every node in the tree
-	@data: (closure): User data to pass to the function
-
-	This calls the function @func on this menu item and all
-	of the children of this item.  And their children.  And
-	their children.  And... you get the point.  It will get
-	called on the whole tree.
+ * dbusmenu_menuitem_foreach:
+ * @mi: The #DbusmenItem to start from
+ * @func: Function to call on every node in the tree
+ * @data: (closure): User data to pass to the function
+ * 
+ * This calls the function @func on this menu item and all
+ * of the children of this item.  And their children.  And
+ * their children.  And... you get the point.  It will get
+ * called on the whole tree.
 */
 void
 dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (DbusmenuMenuitem * mi, gpointer data), gpointer data)
@@ -1417,23 +1420,23 @@ dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (DbusmenuMenuitem
 }
 
 /**
-	dbusmenu_menuitem_handle_event:
-	@mi: The #DbusmenuMenuitem to send the signal on.
-	@name: The name of the signal
-	@variant: A value that could be set for the event
-	@timestamp: The timestamp of when the event happened
-
-	This function is called to create an event.  It is likely
-	to be overrided by subclasses.  The default menu item
-	will respond to the activate signal and do:
-
-	Emits the #DbusmenuMenuitem::item-activate signal on this
-	menu item.  Called by server objects when they get the
-	appropriate DBus signals from the client.
-
-	If you subclass this function you should really think
-	about calling the parent function unless you have a good
-	reason not to.
+ * dbusmenu_menuitem_handle_event:
+ * @mi: The #DbusmenuMenuitem to send the signal on.
+ * @name: The name of the signal
+ * @variant: A value that could be set for the event
+ * @timestamp: The timestamp of when the event happened
+ * 
+ * This function is called to create an event.  It is likely
+ * to be overrided by subclasses.  The default menu item
+ * will respond to the activate signal and do:
+ * 
+ * Emits the #DbusmenuMenuitem::item-activate signal on this
+ * menu item.  Called by server objects when they get the
+ * appropriate DBus signals from the client.
+ * 
+ * If you subclass this function you should really think
+ * about calling the parent function unless you have a good
+ * reason not to.
 */
 void
 dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp)
@@ -1451,16 +1454,16 @@ dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVari
 }
 
 /**
-	dbusmenu_menuitem_send_about_to_show:
-	@mi: The #DbusmenuMenuitem to send the signal on.
-	@cb: Callback to call when the call has returned.
-	@cb_data: (closure): Data to pass to the callback.
-
-	This function is used to send the even that the submenu
-	of this item is about to be shown.  Callers to this event
-	should delay showing the menu until their callback is
-	called if possible.
-*/
+ * dbusmenu_menuitem_send_about_to_show:
+ * @mi: The #DbusmenuMenuitem to send the signal on.
+ * @cb: Callback to call when the call has returned.
+ * @cb_data: (closure): Data to pass to the callback.
+ * 
+ * This function is used to send the even that the submenu
+ * of this item is about to be shown.  Callers to this event
+ * should delay showing the menu until their callback is
+ * called if possible.
+ */
 void
 dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data)
 {
@@ -1480,14 +1483,14 @@ dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (Dbusmen
 }
 
 /**
-	dbusmenu_menuitem_show_to_user:
-	@mi: #DbusmenuMenuitem to show
-	@timestamp: The time that the user requested it to be shown
-
-	Signals that this menu item should be shown to the user.  If this is
-	server side the server will then take it and send it over the
-	bus.
-*/
+ * dbusmenu_menuitem_show_to_user:
+ * @mi: #DbusmenuMenuitem to show
+ * @timestamp: The time that the user requested it to be shown
+ * 
+ * Signals that this menu item should be shown to the user.  If this is
+ * server side the server will then take it and send it over the
+ * bus.
+ */
 void
 dbusmenu_menuitem_show_to_user (DbusmenuMenuitem * mi, guint timestamp)
 {
diff --git a/libdbusmenu-glib/menuitem.h b/libdbusmenu-glib/menuitem.h
index c36e0e9..afd6084 100644
--- a/libdbusmenu-glib/menuitem.h
+++ b/libdbusmenu-glib/menuitem.h
@@ -157,7 +157,7 @@ struct _DbusmenuMenuitemClass
 
 	/* Virtual functions */
 	dbusmenu_menuitem_buildvariant_slot_t buildvariant;
-	void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
+	void (*handle_event) (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp);
 	void (*send_about_to_show) (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 	void (*show_to_user) (DbusmenuMenuitem * mi, guint timestamp, gpointer cb_data);
@@ -208,7 +208,7 @@ void dbusmenu_menuitem_set_root (DbusmenuMenuitem * mi, gboolean root);
 gboolean dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi);
 
 void dbusmenu_menuitem_foreach (DbusmenuMenuitem * mi, void (*func) (DbusmenuMenuitem * mi, gpointer data), gpointer data);
-void dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * value, guint timestamp);
+void dbusmenu_menuitem_handle_event (DbusmenuMenuitem * mi, const gchar * name, GVariant * variant, guint timestamp);
 void dbusmenu_menuitem_send_about_to_show (DbusmenuMenuitem * mi, void (*cb) (DbusmenuMenuitem * mi, gpointer user_data), gpointer cb_data);
 
 void dbusmenu_menuitem_show_to_user (DbusmenuMenuitem * mi, guint timestamp);
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index f66f1f5..50a8f2c 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -78,21 +78,21 @@ if INTROSPECTION_TEN
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
 	--warn-all \
 	--add-include-path=$(top_builddir)/libdbusmenu-glib \
-	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
+	$(addprefix --c-include=libdbusmenu-gtk/, $(libdbusmenu_gtkinclude_HEADERS)) \
 	--symbol-prefix=dbusmenu \
 	--identifier-prefix=DbusmenuGtk
 else
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
 	--warn-all \
 	--add-include-path=$(top_builddir)/libdbusmenu-glib \
-	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))
+	$(addprefix --c-include=libdbusmenu-gtk/, $(libdbusmenu_gtkinclude_HEADERS))
 endif
 
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib
 
 if HAVE_INTROSPECTION
 
-introspection_sources = $(libdbusmenu_gtkinclude_HEADERS)
+introspection_sources = $(filter-out genericmenuitem.%, $(libdbusmenu_gtkinclude_HEADERS) $(libdbusmenu_gtk_la_SOURCES))
 
 DbusmenuGtk$(VER)-0.4.gir: libdbusmenu-gtk$(VER).la
 DbusmenuGtk_0_4_gir_INCLUDES = \
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c
index 7ab2fe9..50978ff 100644
--- a/libdbusmenu-gtk/client.c
+++ b/libdbusmenu-gtk/client.c
@@ -219,13 +219,13 @@ refresh_shortcut (DbusmenuGtkClient * client, DbusmenuMenuitem * mi)
 
 
 /**
-	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.
-*/
+ * 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)
 {
@@ -256,14 +256,14 @@ dbusmenu_gtkclient_set_accel_group (DbusmenuGtkClient * client, GtkAccelGroup *
 }
 
 /**
-	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.
-*/
+ * dbusmenu_gtkclient_get_accel_group:
+ * @client: Client to query for an accelerator group
+ * 
+ * Gets the accel group for this client.
+ * 
+ * Return value: (transfer none): Either a valid group or #NULL on error or
+ * 	none set.
+ */
 GtkAccelGroup *
 dbusmenu_gtkclient_get_accel_group (DbusmenuGtkClient * client)
 {
@@ -493,21 +493,21 @@ destroy_gmi (GtkMenuItem * gmi, DbusmenuMenuitem * mi)
 #endif
 
 /**
-	dbusmenu_gtkclient_newitem_base:
-	@client: The client handling everything on this connection
-	@item: The #DbusmenuMenuitem to attach the GTK-isms to
-	@gmi: A #GtkMenuItem representing the GTK world's view of this menuitem
-	@parent: The parent #DbusmenuMenuitem
-
-	This function provides some of the basic connectivity for being in
-	the GTK world.  Things like visibility and sensitivity of the item are
-	handled here so that the subclasses don't have to.  If you're building
-	your on GTK menu item you can use this function to apply those basic
-	attributes so that you don't have to deal with them either.
-
-	This also handles passing the "activate" signal back to the
-	#DbusmenuMenuitem side of thing.
-*/
+ * dbusmenu_gtkclient_newitem_base:
+ * @client: The client handling everything on this connection
+ * @item: The #DbusmenuMenuitem to attach the GTK-isms to
+ * @gmi: A #GtkMenuItem representing the GTK world's view of this menuitem
+ * @parent: The parent #DbusmenuMenuitem
+ * 
+ * This function provides some of the basic connectivity for being in
+ * the GTK world.  Things like visibility and sensitivity of the item are
+ * handled here so that the subclasses don't have to.  If you're building
+ * your on GTK menu item you can use this function to apply those basic
+ * attributes so that you don't have to deal with them either.
+ * 
+ * This also handles passing the "activate" signal back to the
+ * #DbusmenuMenuitem side of thing.
+ */
 void
 dbusmenu_gtkclient_newitem_base (DbusmenuGtkClient * client, DbusmenuMenuitem * item, GtkMenuItem * gmi, DbusmenuMenuitem * parent)
 {
@@ -617,15 +617,15 @@ move_child (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint new, guint ol
 /* Public API */
 
 /**
-	dbusmenu_gtkclient_new:
-	@dbus_name: Name of the #DbusmenuServer on DBus
-	@dbus_name: Name of the object on the #DbusmenuServer
-
-	Creates a new #DbusmenuGtkClient object and creates a #DbusmenuClient
-	that connects across DBus to a #DbusmenuServer.
-
-	Return value: A new #DbusmenuGtkClient sync'd with a server
-*/
+ * dbusmenu_gtkclient_new:
+ * @dbus_name: Name of the #DbusmenuServer on DBus
+ * @dbus_object: Name of the object on the #DbusmenuServer
+ * 
+ * Creates a new #DbusmenuGtkClient object and creates a #DbusmenuClient
+ * that connects across DBus to a #DbusmenuServer.
+ * 
+ * Return value: A new #DbusmenuGtkClient sync'd with a server
+ */
 DbusmenuGtkClient *
 dbusmenu_gtkclient_new (gchar * dbus_name, gchar * dbus_object)
 {
@@ -636,15 +636,15 @@ dbusmenu_gtkclient_new (gchar * dbus_name, gchar * dbus_object)
 }
 
 /**
-	dbusmenu_gtkclient_menuitem_get:
-	@client: A #DbusmenuGtkClient with the item in it.
-	@item: #DbusmenuMenuitem to get associated #GtkMenuItem on.
-
-	This grabs the #GtkMenuItem that is associated with the
-	#DbusmenuMenuitem.
-
-	Return value: The #GtkMenuItem that can be played with.
-*/
+ * dbusmenu_gtkclient_menuitem_get:
+ * @client: A #DbusmenuGtkClient with the item in it.
+ * @item: #DbusmenuMenuitem to get associated #GtkMenuItem on.
+ * 
+ * This grabs the #GtkMenuItem that is associated with the
+ * #DbusmenuMenuitem.
+ * 
+ * Return value: (transfer none): The #GtkMenuItem that can be played with.
+ */
 GtkMenuItem *
 dbusmenu_gtkclient_menuitem_get (DbusmenuGtkClient * client, DbusmenuMenuitem * item)
 {
@@ -660,13 +660,13 @@ dbusmenu_gtkclient_menuitem_get (DbusmenuGtkClient * client, DbusmenuMenuitem *
 }
 
 /**
-	dbusmenu_gtkclient_menuitem_get_submenu:
-	@client: A #DbusmenuGtkClient with the item in it.
-	@item: #DbusmenuMenuitem to get associated #GtkMenu on.
-
-	This grabs the submenu associated with the menuitem.
-
-	Return value: The #GtkMenu if there is one.
+ * dbusmenu_gtkclient_menuitem_get_submenu:
+ * @client: A #DbusmenuGtkClient with the item in it.
+ * @item: #DbusmenuMenuitem to get associated #GtkMenu on.
+ * 
+ * This grabs the submenu associated with the menuitem.
+ * 
+ * Return value: (transfer none): The #GtkMenu if there is one.
 */
 GtkMenu *
 dbusmenu_gtkclient_menuitem_get_submenu (DbusmenuGtkClient * client, DbusmenuMenuitem * item)
diff --git a/libdbusmenu-gtk/genericmenuitem.c b/libdbusmenu-gtk/genericmenuitem.c
index 2af70f3..2fd6fba 100644
--- a/libdbusmenu-gtk/genericmenuitem.c
+++ b/libdbusmenu-gtk/genericmenuitem.c
@@ -278,12 +278,12 @@ activate (GtkMenuItem * menu_item)
 }
 
 /**
-	genericmenuitem_set_check_type:
-	@item: #Genericmenuitem to set the type on
-	@check_type: Which type of check should be displayed
-
-	This function changes the type of the checkmark that
-	appears in the left hand gutter for the menuitem.
+ * genericmenuitem_set_check_type:
+ * @item: #Genericmenuitem to set the type on
+ * @check_type: Which type of check should be displayed
+ * 
+ * This function changes the type of the checkmark that
+ * appears in the left hand gutter for the menuitem.
 */
 void
 genericmenuitem_set_check_type (Genericmenuitem * item, GenericmenuitemCheckType check_type)
@@ -317,14 +317,14 @@ genericmenuitem_set_check_type (Genericmenuitem * item, GenericmenuitemCheckType
 }
 
 /**
-	genericmenuitem_set_state:
-	@item: #Genericmenuitem to set the type on
-	@check_type: What is the state of the check 
-
-	Sets the state of the check in the menu item.  It does
-	not require, but isn't really useful if the type of
-	check that the menuitem is set to #GENERICMENUITEM_CHECK_TYPE_NONE.
-*/
+ * genericmenuitem_set_state:
+ * @item: #Genericmenuitem to set the type on
+ * @check_type: What is the state of the check 
+ * 
+ * Sets the state of the check in the menu item.  It does
+ * not require, but isn't really useful if the type of
+ * check that the menuitem is set to #GENERICMENUITEM_CHECK_TYPE_NONE.
+ */
 void
 genericmenuitem_set_state (Genericmenuitem * item, GenericmenuitemState state)
 {
@@ -377,11 +377,11 @@ set_image_helper (GtkWidget * widget, gpointer data)
 }
 
 /**
-	genericmenuitem_set_image:
-	@item: A #Genericmenuitem
-	@image: The image to set as the image of @item
-
-	Sets the image of the menu item.
+ * genericmenuitem_set_image:
+ * @item: A #Genericmenuitem
+ * @image: The image to set as the image of @item
+ * 
+ * Sets the image of the menu item.
 */
 void
 genericmenuitem_set_image (Genericmenuitem * menu_item, GtkWidget * image)
@@ -439,13 +439,13 @@ genericmenuitem_set_image (Genericmenuitem * menu_item, GtkWidget * image)
 }
 
 /**
-	genericmenuitem_get_image:
-	@item: A #Genericmenuitem
-
-	Returns the image if there is one.
-
-	Return value: A pointer to the image of the item or #NULL
-		if there isn't one.
+ * genericmenuitem_get_image:
+ * @item: A #Genericmenuitem
+ * 
+ * Returns the image if there is one.
+ * 
+ * Return value: (transfer none): A pointer to the image of the item or #NULL
+ * 	if there isn't one.
 */
 GtkWidget *
 genericmenuitem_get_image (Genericmenuitem * menu_item)
diff --git a/libdbusmenu-gtk/menu.c b/libdbusmenu-gtk/menu.c
index 2a27fe2..c2720ac 100644
--- a/libdbusmenu-gtk/menu.c
+++ b/libdbusmenu-gtk/menu.c
@@ -398,15 +398,15 @@ build_client (DbusmenuGtkMenu * self)
 /* Public API */
 
 /**
-	dbusmenu_gtkmenu_new:
-	@dbus_name: Name of the #DbusmenuServer on DBus
-	@dbus_name: Name of the object on the #DbusmenuServer
-
-	Creates a new #DbusmenuGtkMenu object and creates a #DbusmenuClient
-	that connects across DBus to a #DbusmenuServer.
-
-	Return value: A new #DbusmenuGtkMenu sync'd with a server
-*/
+ * dbusmenu_gtkmenu_new:
+ * @dbus_name: Name of the #DbusmenuServer on DBus
+ * @dbus_object: Name of the object on the #DbusmenuServer
+ * 
+ * Creates a new #DbusmenuGtkMenu object and creates a #DbusmenuClient
+ * that connects across DBus to a #DbusmenuServer.
+ * 
+ * Return value: A new #DbusmenuGtkMenu sync'd with a server
+ */
 DbusmenuGtkMenu *
 dbusmenu_gtkmenu_new (gchar * dbus_name, gchar * dbus_object)
 {
@@ -417,14 +417,14 @@ dbusmenu_gtkmenu_new (gchar * dbus_name, gchar * dbus_object)
 }
 
 /**
-	dbusmenu_gtkmenu_get_client:
-	@menu: The #DbusmenuGtkMenu to get the client from
-
-	An accessor for the client that this menu is using to
-	communicate with the server.
-
-	Return value: A valid #DbusmenuGtkClient or NULL on error.
-*/
+ * dbusmenu_gtkmenu_get_client:
+ * @menu: The #DbusmenuGtkMenu to get the client from
+ * 
+ * An accessor for the client that this menu is using to
+ * communicate with the server.
+ * 
+ * Return value: (transfer none): A valid #DbusmenuGtkClient or NULL on error.
+ */
 DbusmenuGtkClient *
 dbusmenu_gtkmenu_get_client (DbusmenuGtkMenu * menu)
 {
diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c
index fa5eb89..508b43f 100644
--- a/libdbusmenu-gtk/menuitem.c
+++ b/libdbusmenu-gtk/menuitem.c
@@ -31,17 +31,17 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include <gtk/gtk.h>
 
 /**
-	dbusmenu_menuitem_property_set_image:
-	@menuitem: The #DbusmenuMenuitem to set the property on.
-	@property: Name of the property to set.
-	@data: The image to place on the property.
-
-	This function takes the pixbuf that is stored in @data and
-	turns it into a base64 encoded PNG so that it can be placed
-	onto a standard #DbusmenuMenuitem property.
-
-	Return value: Whether the function was able to set the property
-		or not.
+ * dbusmenu_menuitem_property_set_image:
+ * @menuitem: The #DbusmenuMenuitem to set the property on.
+ * @property: Name of the property to set.
+ * @data: The image to place on the property.
+ * 
+ * This function takes the pixbuf that is stored in @data and
+ * turns it into a base64 encoded PNG so that it can be placed
+ * onto a standard #DbusmenuMenuitem property.
+ * 
+ * Return value: Whether the function was able to set the property
+ * 	or not.
 */
 gboolean
 dbusmenu_menuitem_property_set_image (DbusmenuMenuitem * menuitem, const gchar * property, const GdkPixbuf * data)
@@ -77,17 +77,17 @@ dbusmenu_menuitem_property_set_image (DbusmenuMenuitem * menuitem, const gchar *
 }
 
 /**
-	dbusmenu_menuitem_property_get_image:
-	@menuitem: The #DbusmenuMenuite to look for the property on
-	@property: The name of the property to look for.
-
-	This function looks on the menu item for a property by the
-	name of @property.  If one exists it tries to turn it into
-	a #GdkPixbuf.  It assumes that the property is a base64 encoded
-	PNG file like the one created by #dbusmenu_menuite_property_set_image.
-
-	Return value: A pixbuf or #NULL to signal error.
-*/
+ * dbusmenu_menuitem_property_get_image:
+ * @menuitem: The #DbusmenuMenuitem to look for the property on
+ * @property: The name of the property to look for.
+ * 
+ * This function looks on the menu item for a property by the
+ * name of @property.  If one exists it tries to turn it into
+ * a #GdkPixbuf.  It assumes that the property is a base64 encoded
+ * PNG file like the one created by #dbusmenu_menuite_property_set_image.
+ * 
+ * Return value: (transfer full): A pixbuf or #NULL to signal error.
+ */
 GdkPixbuf *
 dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar * property)
 {
@@ -131,16 +131,16 @@ dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar *
 }
 
 /**
-	dbusmenu_menuitem_property_set_shortcut_string:
-	@menuitem: The #DbusmenuMenuitem to set the shortcut on
-	@shortcut: String describing the shortcut
-
-	This function takes a GTK shortcut string as defined in
-	#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.
-*/
+ * dbusmenu_menuitem_property_set_shortcut_string:
+ * @menuitem: The #DbusmenuMenuitem to set the shortcut on
+ * @shortcut: String describing the shortcut
+ * 
+ * This function takes a GTK shortcut string as defined in
+ * #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.
+ */
 gboolean
 dbusmenu_menuitem_property_set_shortcut_string (DbusmenuMenuitem * menuitem, const gchar * shortcut)
 {
@@ -161,16 +161,16 @@ dbusmenu_menuitem_property_set_shortcut_string (DbusmenuMenuitem * menuitem, con
 }
 
 /**
-	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.
-*/
+ * 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)
 {
@@ -213,16 +213,16 @@ find_closure (GtkAccelKey * key, GClosure * closure, gpointer user_data)
 }
 
 /**
-	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.
-*/
+ * 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)
 {
@@ -260,14 +260,14 @@ dbusmenu_menuitem_property_set_shortcut_menuitem (DbusmenuMenuitem * menuitem, c
 }
 
 /**
-	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 as a key and a mask
-	for use to set the accelerators.
-*/
+ * dbusmenu_menuitem_property_get_shortcut:
+ * @menuitem: The #DbusmenuMenuitem to get the shortcut off
+ * @key: (out): Location to put the key value
+ * @modifier: (out): Location to put the modifier mask
+ * 
+ * This function gets a GTK shortcut as a key and a mask
+ * for use to set the accelerators.
+ */
 void
 dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * key, GdkModifierType * modifier)
 {
diff --git a/libdbusmenu-gtk/menuitem.h b/libdbusmenu-gtk/menuitem.h
index 4fc42f9..6f009df 100644
--- a/libdbusmenu-gtk/menuitem.h
+++ b/libdbusmenu-gtk/menuitem.h
@@ -43,7 +43,7 @@ GdkPixbuf * dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, c
 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);
+void dbusmenu_menuitem_property_get_shortcut (DbusmenuMenuitem * menuitem, guint * key, GdkModifierType * modifier);
 
 G_END_DECLS
 
diff --git a/libdbusmenu-gtk/parser.c b/libdbusmenu-gtk/parser.c
index 8aa2837..f516dde 100644
--- a/libdbusmenu-gtk/parser.c
+++ b/libdbusmenu-gtk/parser.c
@@ -85,16 +85,16 @@ static void           menuitem_notify_cb       (GtkWidget *         widget,
                                                 gpointer            data);
 
 /**
-	dbusmenu_gtk_parse_menu_structure:
-	@widget: A #GtkMenuItem or #GtkMenuShell to turn into a #DbusmenuMenuitem
-
-	Goes through the GTK structures and turns them into the appropraite
-	Dbusmenu structures along with setting up all the relationships
-	between the objects.  It also stores the dbusmenu items as a cache
-	on the GTK items so that they'll be reused if necissary.
-
-	Return value: A dbusmenu item representing the menu structure
-*/
+ * dbusmenu_gtk_parse_menu_structure:
+ * @widget: A #GtkMenuItem or #GtkMenuShell to turn into a #DbusmenuMenuitem
+ * 
+ * Goes through the GTK structures and turns them into the appropraite
+ * Dbusmenu structures along with setting up all the relationships
+ * between the objects.  It also stores the dbusmenu items as a cache
+ * on the GTK items so that they'll be reused if necissary.
+ * 
+ * Return value: (transfer full): A dbusmenu item representing the menu structure
+ */
 DbusmenuMenuitem *
 dbusmenu_gtk_parse_menu_structure (GtkWidget * widget)
 {
diff --git a/libdbusmenu-gtk/serializablemenuitem.c b/libdbusmenu-gtk/serializablemenuitem.c
index cfd864d..29f83a8 100644
--- a/libdbusmenu-gtk/serializablemenuitem.c
+++ b/libdbusmenu-gtk/serializablemenuitem.c
@@ -33,7 +33,7 @@ License version 3 and version 2.1 along with this program.  If not, see
 #include "client.h"
 #include "serializablemenuitem.h"
 
-/**
+/*
 	DbusmenuGtkSerializableMenuItemPrivate:
 	@mi: Menuitem to watch the property changes from
 */
@@ -166,18 +166,18 @@ get_property (GObject * obj, guint id, GValue * value, GParamSpec * pspec)
 }
 
 /**
-	dbusmenu_gtk_serializable_menu_item_build_menuitem:
-	@smi: #DbusmenuGtkSerializableMenuItem to build a #DbusmenuMenuitem mirroring
-
-	This function is for menu items that are instanciated from
-	GTK and have their properites set using GTK functions.  This
-	builds a #DbusmenuMenuitem that then has the properties that
-	should be sent over the bus to create a new item of this
-	type on the other side.
-
-	Return value: (transfer full) A #DbusmenuMenuitem who's values will be
-		set by this object.
-*/
+ * dbusmenu_gtk_serializable_menu_item_build_menuitem:
+ * @smi: #DbusmenuGtkSerializableMenuItem to build a #DbusmenuMenuitem mirroring
+ * 
+ * This function is for menu items that are instanciated from
+ * GTK and have their properites set using GTK functions.  This
+ * builds a #DbusmenuMenuitem that then has the properties that
+ * should be sent over the bus to create a new item of this
+ * type on the other side.
+ * 
+ * Return value: (transfer full): A #DbusmenuMenuitem who's values will be
+ * 	set by this object.
+ */
 DbusmenuMenuitem *
 dbusmenu_gtk_serializable_menu_item_build_menuitem (DbusmenuGtkSerializableMenuItem * smi)
 {
@@ -225,15 +225,15 @@ type_destroy_handler (DbusmenuClient * client, const gchar * type, gpointer user
 }
 
 /**
-	dbusmenu_gtk_serializable_menu_item_register_to_client:
-	@client: #DbusmenuClient that we should register a type at.
-	@item_type: The #GType of a class that is a subclass of #DbusmenuGtkSerializableMenuItem
-
-	Registers a generic handler for dealing with all subclasses of
-	#DbusmenuGtkSerializableMenuItem.  This handler responds to the callback,
-	creates a new object and attaches it to the appropriate #DbusmenuMenuitem
-	object.
-*/
+ * dbusmenu_gtk_serializable_menu_item_register_to_client:
+ * @client: #DbusmenuClient that we should register a type at.
+ * @item_type: The #GType of a class that is a subclass of #DbusmenuGtkSerializableMenuItem
+ * 
+ * Registers a generic handler for dealing with all subclasses of
+ * #DbusmenuGtkSerializableMenuItem.  This handler responds to the callback,
+ * creates a new object and attaches it to the appropriate #DbusmenuMenuitem
+ * object.
+ */
 void
 dbusmenu_gtk_serializable_menu_item_register_to_client (DbusmenuClient * client, GType item_type)
 {
@@ -265,16 +265,16 @@ dbusmenu_gtk_serializable_menu_item_register_to_client (DbusmenuClient * client,
 }
 
 /**
-	dbusmenu_gtk_serializable_menu_item_set_menuitem:
-	@smi: #DbusmenuGtkSerializableMenuItem to set the @DbusmenuGtkSerializableMenuItem::dbusmenu-menuitem of
-	@mi: Menuitem to get the properties from
-
-	This function is used on the server side to signal to the object
-	that it should get its' property change events from @mi instead
-	of expecting calls to its' API.  A call to this function sets the
-	property and subclasses should listen to the notify signal to
-	pick up this property being set.
-*/
+ * dbusmenu_gtk_serializable_menu_item_set_menuitem:
+ * @smi: #DbusmenuGtkSerializableMenuItem to set the @DbusmenuGtkSerializableMenuItem::dbusmenu-menuitem of
+ * @mi: Menuitem to get the properties from
+ * 
+ * This function is used on the server side to signal to the object
+ * that it should get its' property change events from @mi instead
+ * of expecting calls to its' API.  A call to this function sets the
+ * property and subclasses should listen to the notify signal to
+ * pick up this property being set.
+ */
 void
 dbusmenu_gtk_serializable_menu_item_set_menuitem (DbusmenuGtkSerializableMenuItem * smi, DbusmenuMenuitem * mi)
 {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 32c8437..61b3e69 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,6 +3,7 @@ DBUS_RUNNER=dbus-test-runner
 
 CLEANFILES=
 DISTCLEANFILES=
+EXTRA_DIST = 
 
 TESTS = \
 	test-glib-objects-test \
@@ -16,9 +17,11 @@ TESTS = \
 	test-gtk-objects-test \
 	test-gtk-label \
 	test-gtk-shortcut \
+	test-gtk-shortcut-python \
 	test-gtk-reorder \
 	test-gtk-submenu \
-	test-gtk-parser-test
+	test-gtk-parser-test \
+	test-glib-simple-items.py
 
 check_PROGRAMS = \
 	glib-server-nomenu \
@@ -49,6 +52,9 @@ check_PROGRAMS = \
 
 XVFB_RUN=". $(srcdir)/run-xvfb.sh"
 
+# for the GI tests, prefer/use the typelibs from the local build tree
+TESTS_ENVIRONMENT = env GI_TYPELIB_PATH=$(top_builddir)/libdbusmenu-glib:$(top_builddir)/libdbusmenu-gtk:$(GI_TYPELIB_PATH)
+
 ######################
 # JSON Loader lib
 ######################
@@ -361,6 +367,8 @@ test_glib_simple_items_LDADD = \
 	../libdbusmenu-glib/libdbusmenu-glib.la \
 	$(DBUSMENUGLIB_LIBS)
 
+EXTRA_DIST += test-glib-simple-items.py
+
 ######################
 # Test GTK Object
 ######################
@@ -503,6 +511,19 @@ test_gtk_shortcut_client_LDADD = \
 	$(DBUSMENUTESTS_LIBS)
 
 #########################
+# Test GTK Shortcut Python
+#########################
+
+test-gtk-shortcut-python: test-gtk-shortcut-server test-gtk-shortcut-client.py Makefile.am
+	@echo "#!/bin/bash" > $@
+	@echo $(XVFB_RUN) >> $@
+	@echo $(DBUS_RUNNER) --task $(srcdir)/test-gtk-shortcut-client.py --task-name Client --task ./test-gtk-shortcut-server --task-name Server --ignore-return >> $@
+	@chmod +x $@
+
+EXTRA_DIST += test-gtk-shortcut-client.py
+CLEANFILES += test-gtk-shortcut-client.pyc
+
+#########################
 # Test GTK Reorder
 #########################
 
@@ -596,7 +617,7 @@ jsondir = $(datadir)/${PACKAGE}/json/
 json_DATA = \
 	test-gtk-label.json
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	$(examples_DATA) \
 	run-xvfb.sh \
 	$(json_DATA) \
@@ -629,5 +650,5 @@ distclean-local:
 	-rm -rf $(builddir)/mago.results
 
 DISTCLEANFILES += \
-	$(TESTS) 
+	$(filter-out %.py, $(TESTS))
 
diff --git a/tests/test-glib-simple-items.py b/tests/test-glib-simple-items.py
new file mode 100755
index 0000000..d7ad7d7
--- /dev/null
+++ b/tests/test-glib-simple-items.py
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+# This is the Python GI version of test-glib-simple-items.c
+
+import gobject
+from gi.repository import Dbusmenu
+
+dummies = ['Bob', 'Jim', 'Alvin', 'Mary']
+
+def dummy_users(root):
+    count = 0
+    for user in dummies:
+        mi = Dbusmenu.Menuitem()
+        print 'Creating item: %d %s' % (mi.get_id(), user)
+        print '\tRoot ID:', root.get_id()
+        mi.property_set('label', user)
+        root.child_add_position(mi, count)
+        assert mi.property_get('label') == user
+        count += 1
+
+def quititall(mainloop):
+    mainloop.quit()
+    return False
+
+# main
+
+server = Dbusmenu.Server.new('/test/object')
+root_menuitem = Dbusmenu.Menuitem()
+server.set_root(root_menuitem)
+print 'Root ID:', root_menuitem.get_id()
+
+dummy_users(root_menuitem)
+
+mainloop = gobject.MainLoop()
+gobject.timeout_add_seconds(1, quititall, mainloop)
+mainloop.run()
diff --git a/tests/test-gtk-shortcut-client.py b/tests/test-gtk-shortcut-client.py
new file mode 100755
index 0000000..885d227
--- /dev/null
+++ b/tests/test-gtk-shortcut-client.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+# A test for libdbusmenu to ensure its quality. This is the Python GI version
+# of test-gtk-shortcut-client.c
+#
+# Copyright 2011 Canonical Ltd.
+# Authors:
+#   Martin Pitt <martin.pitt@ubuntu.com>
+
+import sys
+import gobject
+from gi.repository import Gtk, DbusmenuGtk
+Gtk.require_version('2.0')
+
+passed = True
+main_loop = gobject.MainLoop()
+
+def timer_func(data):
+    passed = True
+    main_loop.quit()
+    return False
+
+# main
+print 'Building Window'
+window = Gtk.Window(type=Gtk.WindowType.TOPLEVEL)
+menubar = Gtk.MenuBar()
+menuitem = Gtk.MenuItem(label='Test')
+
+dmenu = DbusmenuGtk.Menu(dbus_name='glib.label.test', dbus_object='/org/test')
+dclient = dmenu.get_client()
+agroup = Gtk.AccelGroup()
+dclient.set_accel_group(agroup)
+
+menuitem.set_submenu(dmenu)
+menuitem.show()
+menubar.append(menuitem)
+menubar.show()
+window.add(menubar)
+window.set_title('libdbusmenu-gtk test')
+window.add_accel_group(agroup)
+window.show_all()
+
+gobject.timeout_add_seconds(10, timer_func, window)
+
+print 'Entering Mainloop'
+main_loop.run()
+
+if passed:
+    print 'Quiting'
+else:
+    print "Quiting as we're a failure"
+    sys.exit(1)