Fix GI annotations for Dbusmenu

Now everything is introspectable except for
dbusmenu_client_add_type_handler{,_full}(). These do not take a standard
GDestroyNotify argument, and thus the newfunc callback cannot get any valid
scope annotation. To fix this we need to break the API and ABI.

1 files changed, 362 insertions, 361 deletions

diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c
index 159463b..b5a87a4 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)
@@ -1255,14 +1256,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)
 {
@@ -1285,15 +1286,15 @@ dbusmenu_menuitem_properties_variant (DbusmenuMenuitem * mi)
 }
 
 /**
-	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)
 {
@@ -1304,14 +1305,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)
 {
@@ -1322,16 +1323,16 @@ dbusmenu_menuitem_get_root (DbusmenuMenuitem * mi)
 
 
 /**
-	dbusmenu_menuitem_buildxml:
-	@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_buildxml:
+ * @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.
+ */
 void
 dbusmenu_menuitem_buildxml (DbusmenuMenuitem * mi, GPtrArray * array)
 {
@@ -1369,15 +1370,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)
@@ -1393,23 +1394,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)
@@ -1427,16 +1428,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)
 {
@@ -1456,14 +1457,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)
 {