New upstream release.

1 files changed, 119 insertions, 221 deletions

diff --git a/docs/libdbusmenu-glib/reference/xml/menuitem.xml b/docs/libdbusmenu-glib/reference/xml/menuitem.xml
index 858e829..9e32406 100644
--- a/docs/libdbusmenu-glib/reference/xml/menuitem.xml
+++ b/docs/libdbusmenu-glib/reference/xml/menuitem.xml
@@ -50,14 +50,14 @@ Unstable, unless otherwise indicated
 #define             <link linkend="DBUSMENU-MENUITEM-TOGGLE-STATE-UNKNOWN:CAPS">DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN</link>
 #define             <link linkend="DBUSMENU-MENUITEM-ICON-NAME-BLANK:CAPS">DBUSMENU_MENUITEM_ICON_NAME_BLANK</link>
 #define             <link linkend="DBUSMENU-MENUITEM-CHILD-DISPLAY-SUBMENU:CAPS">DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU</link>
-                    <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link>;
+struct              <link linkend="DbusmenuMenuitem">DbusmenuMenuitem</link>;
 <link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="dbusmenu-menuitem-about-to-show-cb">*dbusmenu_menuitem_about_to_show_cb</link>)
                                                         (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
                                                          <parameter><link linkend="gpointer"><type>gpointer</type></link> user_data</parameter>);
 <link linkend="void"><returnvalue>void</returnvalue></link>                (<link linkend="dbusmenu-menuitem-buildxml-slot-t">*dbusmenu_menuitem_buildxml_slot_t</link>)
                                                         (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
                                                          <parameter><link linkend="GPtrArray"><type>GPtrArray</type></link> *stringarray</parameter>);
-                    <link linkend="DbusmenuMenuitemClass">DbusmenuMenuitemClass</link>;
+struct              <link linkend="DbusmenuMenuitemClass">DbusmenuMenuitemClass</link>;
 <link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  <link linkend="dbusmenu-menuitem-new">dbusmenu_menuitem_new</link>               (<parameter><type>void</type></parameter>);
 <link linkend="DbusmenuMenuitem"><returnvalue>DbusmenuMenuitem</returnvalue></link> *  <link linkend="dbusmenu-menuitem-new-with-id">dbusmenu_menuitem_new_with_id</link>       (<parameter><link linkend="gint"><type>gint</type></link> id</parameter>);
 <link linkend="gint"><returnvalue>gint</returnvalue></link>                <link linkend="dbusmenu-menuitem-get-id">dbusmenu_menuitem_get_id</link>            (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);
@@ -110,7 +110,7 @@ const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *       <lin
                                                          <parameter><link linkend="gboolean"><type>gboolean</type></link> root</parameter>);
 <link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-get-root">dbusmenu_menuitem_get_root</link>          (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>);
 <link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-menuitem-foreach">dbusmenu_menuitem_foreach</link>           (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
-                                                         <parameter><link linkend="void"><type>void</type></link> (funcDbusmenuMenuitem * mi, gpointer data) ()</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> (*func) (DbusmenuMenuitem * mi, gpointer data)</parameter>,
                                                          <parameter><link linkend="gpointer"><type>gpointer</type></link> data</parameter>);
 <link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-menuitem-handle-event">dbusmenu_menuitem_handle_event</link>      (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
                                                          <parameter>const <link linkend="gchar"><type>gchar</type></link> *name</parameter>,
@@ -118,7 +118,7 @@ const <link linkend="gchar"><returnvalue>gchar</returnvalue></link> *       <lin
                                                          <parameter><link linkend="guint"><type>guint</type></link> timestamp</parameter>);
 <link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-menuitem-send-about-to-show">dbusmenu_menuitem_send_about_to_show</link>
                                                         (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
-                                                         <parameter><link linkend="void"><type>void</type></link> (cbDbusmenuMenuitem * mi, gpointer user_data) ()</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> (*cb) (DbusmenuMenuitem * mi, gpointer user_data)</parameter>,
                                                          <parameter><link linkend="gpointer"><type>gpointer</type></link> cb_data</parameter>);
 </synopsis>
 </refsynopsisdiv>
@@ -304,14 +304,14 @@ objects and handled appropriately.
 <para>
 </para></refsect2>
 <refsect2 id="DbusmenuMenuitem" role="struct">
-<title>DbusmenuMenuitem</title>
+<title>struct DbusmenuMenuitem</title>
 <indexterm zone="DbusmenuMenuitem"><primary>DbusmenuMenuitem</primary></indexterm>
-<programlisting>typedef struct {
+<programlisting>struct DbusmenuMenuitem {
 	GObject parent;
 
 	/*&lt; Private &gt;*/
 	DbusmenuMenuitemPrivate * priv;
-} DbusmenuMenuitem;
+};
 </programlisting>
 <para>
 This is the <link linkend="GObject"><type>GObject</type></link> based object that represents a menu
@@ -332,10 +332,9 @@ Callback prototype for a callback that is called when the
 menu should be shown.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>Menu item that should be shown
-</simpara></listitem></varlistentry>
+<listitem><simpara>Menu item that should be shown</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>user_data</parameter>&#160;:</term>
-<listitem><simpara> Extra user data sent with the function. <emphasis role="annotation">[closure]</emphasis></simpara></listitem></varlistentry>
+<listitem><simpara>Extra user data sent with the function. <emphasis role="annotation">[<acronym>closure</acronym>]</emphasis></simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-buildxml-slot-t" role="function">
 <title>dbusmenu_menuitem_buildxml_slot_t ()</title>
@@ -348,14 +347,14 @@ This is the function that is called to represent this menu item
 as an XML fragment.  Should call it's own children.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara> Menu item that should be built from. <emphasis role="annotation">[<acronym>in</acronym>]</emphasis></simpara></listitem></varlistentry>
+<listitem><simpara>Menu item that should be built from. <emphasis role="annotation">[<acronym>in</acronym>]</emphasis></simpara></listitem></varlistentry>
 <varlistentry><term><parameter>stringarray</parameter>&#160;:</term>
-<listitem><simpara> An array of strings that can be combined into an XML file. <emphasis role="annotation">[<acronym>inout</acronym>][<acronym>transfer none</acronym>][<acronym>array</acronym>][<acronym>element-type</acronym> utf8]</emphasis></simpara></listitem></varlistentry>
+<listitem><simpara>An array of strings that can be combined into an XML file. <emphasis role="annotation">[<acronym>inout</acronym>][<acronym>transfer none</acronym>][<acronym>array</acronym>][<acronym>element-type</acronym> utf8]</emphasis></simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="DbusmenuMenuitemClass" role="struct">
-<title>DbusmenuMenuitemClass</title>
+<title>struct DbusmenuMenuitemClass</title>
 <indexterm zone="DbusmenuMenuitemClass"><primary>DbusmenuMenuitemClass</primary></indexterm>
-<programlisting>typedef struct {
+<programlisting>struct DbusmenuMenuitemClass {
 	GObjectClass parent_class;
 
 	/* Signals */
@@ -381,7 +380,7 @@ as an XML fragment.  Should call it's own children.
 	void (*reserved4) (void);
 	void (*reserved5) (void);
 	void (*reserved6) (void);
-} DbusmenuMenuitemClass;
+};
 </programlisting>
 <para>
 <parameter>reserved1</parameter>: Reserved for future use.
@@ -392,72 +391,55 @@ as an XML fragment.  Should call it's own children.
 <parameter>reserved6</parameter>: Reserved for future use.
 </para><variablelist role="struct">
 <varlistentry><term><link linkend="GObjectClass"><type>GObjectClass</type></link>&#160;<structfield id="DbusmenuMenuitemClass.parent-class">parent_class</structfield>;</term>
-<listitem><simpara>
-</simpara></listitem>
+<listitem><simpara></simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.property-changed">property_changed</structfield>&#160;()</term>
-<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-property-changed"><type>"property-changed"</type></link>.
-</simpara></listitem>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-property-changed"><type>"property-changed"</type></link>.</simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.item-activated">item_activated</structfield>&#160;()</term>
-<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-item-activated"><type>"item-activated"</type></link>.
-</simpara></listitem>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-item-activated"><type>"item-activated"</type></link>.</simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.child-added">child_added</structfield>&#160;()</term>
-<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-child-added"><type>"child-added"</type></link>.
-</simpara></listitem>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-child-added"><type>"child-added"</type></link>.</simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.child-removed">child_removed</structfield>&#160;()</term>
-<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-child-removed"><type>"child-removed"</type></link>.
-</simpara></listitem>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-child-removed"><type>"child-removed"</type></link>.</simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.child-moved">child_moved</structfield>&#160;()</term>
-<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-child-moved"><type>"child-moved"</type></link>.
-</simpara></listitem>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-child-moved"><type>"child-moved"</type></link>.</simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.realized">realized</structfield>&#160;()</term>
-<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-realized"><type>"realized"</type></link>.
-</simpara></listitem>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-realized"><type>"realized"</type></link>.</simpara></listitem>
 </varlistentry>
 <varlistentry><term><link linkend="dbusmenu-menuitem-buildxml-slot-t"><type>dbusmenu_menuitem_buildxml_slot_t</type></link>&#160;<structfield id="DbusmenuMenuitemClass.buildxml">buildxml</structfield>;</term>
-<listitem><simpara>Virtual function that appends the strings required to represent this menu item in the menu XML file.
-</simpara></listitem>
+<listitem><simpara>Virtual function that appends the strings required to represent this menu item in the menu XML file.</simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.handle-event">handle_event</structfield>&#160;()</term>
-<listitem><simpara>This function is to override how events are handled by subclasses.  Look at <link linkend="dbusmenu-menuitem-handle-event"><type>dbusmenu_menuitem_handle_event</type></link> for lots of good information.
-</simpara></listitem>
+<listitem><simpara>This function is to override how events are handled by subclasses.  Look at <link linkend="dbusmenu-menuitem-handle-event"><type>dbusmenu_menuitem_handle_event</type></link> for lots of good information.</simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.show-to-user">show_to_user</structfield>&#160;()</term>
-<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-show-to-user"><type>"show-to-user"</type></link>.
-</simpara></listitem>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-show-to-user"><type>"show-to-user"</type></link>.</simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.about-to-show">about_to_show</structfield>&#160;()</term>
-<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-about-to-show"><type>"about-to-show"</type></link>.
-</simpara></listitem>
+<listitem><simpara>Slot for <link linkend="DbusmenuMenuitem-about-to-show"><type>"about-to-show"</type></link>.</simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.reserved1">reserved1</structfield>&#160;()</term>
-<listitem><simpara>
-</simpara></listitem>
+<listitem><simpara></simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.reserved2">reserved2</structfield>&#160;()</term>
-<listitem><simpara>
-</simpara></listitem>
+<listitem><simpara></simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.reserved3">reserved3</structfield>&#160;()</term>
-<listitem><simpara>
-</simpara></listitem>
+<listitem><simpara></simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.reserved4">reserved4</structfield>&#160;()</term>
-<listitem><simpara>
-</simpara></listitem>
+<listitem><simpara></simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.reserved5">reserved5</structfield>&#160;()</term>
-<listitem><simpara>
-</simpara></listitem>
+<listitem><simpara></simpara></listitem>
 </varlistentry>
 <varlistentry><term><structfield id="DbusmenuMenuitemClass.reserved6">reserved6</structfield>&#160;()</term>
-<listitem><simpara>
-</simpara></listitem>
+<listitem><simpara></simpara></listitem>
 </varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-new" role="function">
@@ -467,8 +449,7 @@ as an XML fragment.  Should call it's own children.
 <para>
 Create a new <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> with all default values.
 </para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A newly allocated <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>.
-</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A newly allocated <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-new-with-id" role="function">
 <title>dbusmenu_menuitem_new_with_id ()</title>
@@ -478,10 +459,8 @@ Create a new <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></lin
 This creates a blank <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> with a specific ID.
 </para><variablelist role="params">
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>ID to use for this menuitem
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A newly allocated <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>.
-</simpara></listitem></varlistentry>
+<listitem><simpara>ID to use for this menuitem</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A newly allocated <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-get-id" role="function">
 <title>dbusmenu_menuitem_get_id ()</title>
@@ -491,10 +470,8 @@ This creates a blank <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</ty
 Gets the unique ID for <parameter>mi</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to query.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The ID of the <parameter>mi</parameter>.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to query.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The ID of the <parameter>mi</parameter>.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-get-children" role="function">
 <title>dbusmenu_menuitem_get_children ()</title>
@@ -506,10 +483,8 @@ Returns simply the list of children that this menu item
 	is called, where it might be changed.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to query.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="GList"><type>GList</type></link> of pointers to <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> objects.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to query.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A <link linkend="GList"><type>GList</type></link> of pointers to <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> objects.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-take-children" role="function">
 <title>dbusmenu_menuitem_take_children ()</title>
@@ -523,10 +498,8 @@ While the name sounds devious that's exactly what this function
 	in taking children.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> to take the children from.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A <link linkend="GList"><type>GList</type></link> of pointers to <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> objects.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> to take the children from.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A <link linkend="GList"><type>GList</type></link> of pointers to <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> objects.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-get-position" role="function">
 <title>dbusmenu_menuitem_get_position ()</title>
@@ -539,13 +512,10 @@ This function returns the position of the menu item <parameter>mi</parameter>
 	menu item can't be found.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to find the position of
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to find the position of</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>parent</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> who's children contain <parameter>mi</parameter>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The position of <parameter>mi</parameter> in the children of <parameter>parent</parameter>.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> who's children contain <parameter>mi</parameter></simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The position of <parameter>mi</parameter> in the children of <parameter>parent</parameter>.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-get-position-realized" role="function">
 <title>dbusmenu_menuitem_get_position_realized ()</title>
@@ -558,13 +528,10 @@ This function is very similar to <link linkend="dbusmenu-menuitem-get-position">
 	except that it only counts in the children that have been realized.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to find the position of
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to find the position of</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>parent</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> who's children contain <parameter>mi</parameter>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The position of <parameter>mi</parameter> in the realized children of <parameter>parent</parameter>.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> who's children contain <parameter>mi</parameter></simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The position of <parameter>mi</parameter> in the realized children of <parameter>parent</parameter>.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-child-append" role="function">
 <title>dbusmenu_menuitem_child_append ()</title>
@@ -576,13 +543,10 @@ This function adds <parameter>child</parameter> to the list of children on <para
 	the end of that list.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which will become a new parent
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which will become a new parent</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>child</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> that will be a child
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Whether the child has been added successfully.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> that will be a child</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>Whether the child has been added successfully.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-child-prepend" role="function">
 <title>dbusmenu_menuitem_child_prepend ()</title>
@@ -594,13 +558,10 @@ This function adds <parameter>child</parameter> to the list of children on <para
 	the beginning of that list.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which will become a new parent
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which will become a new parent</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>child</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> that will be a child
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Whether the child has been added successfully.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenMenuitem"><type>DbusmenMenuitem</type></link> that will be a child</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>Whether the child has been added successfully.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-child-delete" role="function">
 <title>dbusmenu_menuitem_child_delete ()</title>
@@ -612,14 +573,11 @@ This function removes <parameter>child</parameter> from the children list of <pa
 	not call <link linkend="g-object-unref"><type>g_object_unref</type></link> on <parameter>child</parameter>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which has <parameter>child</parameter> as a child
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> which has <parameter>child</parameter> as a child</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>child</parameter>&#160;:</term>
 <listitem><simpara>The child <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> that you want to no longer
-	    be a child of <parameter>mi</parameter>.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> If we were able to delete <parameter>child</parameter>.
-</simpara></listitem></varlistentry>
+be a child of <parameter>mi</parameter>.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>If we were able to delete <parameter>child</parameter>.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-child-add-position" role="function">
 <title>dbusmenu_menuitem_child_add_position ()</title>
@@ -634,16 +592,12 @@ Puts <parameter>child</parameter> in the list of children for <parameter>mi</par
 	then <parameter>child</parameter> will be placed at the end of the list.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> that we're adding the child <parameter>child</parameter> to.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> that we're adding the child <parameter>child</parameter> to.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>child</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to make a child of <parameter>mi</parameter>.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to make a child of <parameter>mi</parameter>.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>position</parameter>&#160;:</term>
-<listitem><simpara>Where in <parameter>mi</parameter> object's list of chidren <parameter>child</parameter> should be placed.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Whether <parameter>child</parameter> was added successfully.
-</simpara></listitem></varlistentry>
+<listitem><simpara>Where in <parameter>mi</parameter> object's list of chidren <parameter>child</parameter> should be placed.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>Whether <parameter>child</parameter> was added successfully.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-child-reorder" role="function">
 <title>dbusmenu_menuitem_child_reorder ()</title>
@@ -656,17 +610,11 @@ 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.
 </para><variablelist role="params">
-<varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>child</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> that is a child needing to be moved
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> that is a child needing to be moved</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>position</parameter>&#160;:</term>
-<listitem><simpara>The position in the list to place it in
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> Whether the move was successful.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The position in the list to place it in</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>Whether the move was successful.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-child-find" role="function">
 <title>dbusmenu_menuitem_child_find ()</title>
@@ -678,14 +626,11 @@ Search the children of <parameter>mi</parameter> to find one with the ID of <par
 	If it doesn't exist then we return <link linkend="NULL:CAPS"><type>NULL</type></link>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> who's children to look on
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> who's children to look on</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>The ID of the child that we're looking for.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The menu item with the ID <parameter>id</parameter> or <link linkend="NULL:CAPS"><type>NULL</type></link> if it
-	   can't be found.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The ID of the child that we're looking for.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The menu item with the ID <parameter>id</parameter> or <link linkend="NULL:CAPS"><type>NULL</type></link> if it
+can't be found.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-find-id" role="function">
 <title>dbusmenu_menuitem_find_id ()</title>
@@ -698,15 +643,12 @@ This function searchs the whole tree of children that
 	the way down the tree.  It is a depth first search.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> at the top of the tree to search
-</simpara></listitem></varlistentry>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> at the top of the tree to search</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>id</parameter>&#160;:</term>
-<listitem><simpara>ID of the <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to search for
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> with the ID of <parameter>id</parameter>
-		or <link linkend="NULL:CAPS"><type>NULL</type></link> if there isn't such a menu item in the tree
-		represented by <parameter>mi</parameter>.
-</simpara></listitem></varlistentry>
+<listitem><simpara>ID of the <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to search for</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> with the ID of <parameter>id</parameter>
+or <link linkend="NULL:CAPS"><type>NULL</type></link> if there isn't such a menu item in the tree
+represented by <parameter>mi</parameter>.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-property-set" role="function">
 <title>dbusmenu_menuitem_property_set ()</title>
@@ -723,16 +665,12 @@ Takes the pair of <parameter>property</parameter> and <parameter>value</paramete
 	emitted by this function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the property on.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the property on.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>property</parameter>&#160;:</term>
-<listitem><simpara>Name of the property to set.
-</simpara></listitem></varlistentry>
+<listitem><simpara>Name of the property to set.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>value</parameter>&#160;:</term>
-<listitem><simpara>The value of the property.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>  A boolean representing if the property value was set.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The value of the property.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A boolean representing if the property value was set.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-property-set-bool" role="function">
 <title>dbusmenu_menuitem_property_set_bool ()</title>
@@ -749,16 +687,12 @@ Takes a boolean <parameter>value</parameter> and sets it on <parameter>property<
 	emitted by this function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the property on.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the property on.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>property</parameter>&#160;:</term>
-<listitem><simpara>Name of the property to set.
-</simpara></listitem></varlistentry>
+<listitem><simpara>Name of the property to set.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>value</parameter>&#160;:</term>
-<listitem><simpara>The value of the property.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>  A boolean representing if the property value was set.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The value of the property.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A boolean representing if the property value was set.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-property-set-int" role="function">
 <title>dbusmenu_menuitem_property_set_int ()</title>
@@ -775,16 +709,12 @@ Takes a boolean <parameter>value</parameter> and sets it on <parameter>property<
 	emitted by this function.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the property on.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the property on.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>property</parameter>&#160;:</term>
-<listitem><simpara>Name of the property to set.
-</simpara></listitem></varlistentry>
+<listitem><simpara>Name of the property to set.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>value</parameter>&#160;:</term>
-<listitem><simpara>The value of the property.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>  A boolean representing if the property value was set.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The value of the property.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A boolean representing if the property value was set.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-property-get" role="function">
 <title>dbusmenu_menuitem_property_get ()</title>
@@ -797,15 +727,12 @@ Look up a property on <parameter>mi</parameter> and return the value of it if
 	exist.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to look for the property on.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to look for the property on.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>property</parameter>&#160;:</term>
-<listitem><simpara>The property to grab.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A string with the value of the property
-		that shouldn't be free'd.  Or <link linkend="NULL:CAPS"><type>NULL</type></link> if the property
-		is not set or is not a string.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The property to grab.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A string with the value of the property
+that shouldn't be free'd.  Or <link linkend="NULL:CAPS"><type>NULL</type></link> if the property
+is not set or is not a string.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-property-get-bool" role="function">
 <title>dbusmenu_menuitem_property_get_bool ()</title>
@@ -817,13 +744,10 @@ Look up a property on <parameter>mi</parameter> and return the value of it if
 	it exits.  Returns <link linkend="FALSE:CAPS"><type>FALSE</type></link> if the property doesn't exist.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to look for the property on.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to look for the property on.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>property</parameter>&#160;:</term>
-<listitem><simpara>The property to grab.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The value of the property or <link linkend="FALSE:CAPS"><type>FALSE</type></link>.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The property to grab.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The value of the property or <link linkend="FALSE:CAPS"><type>FALSE</type></link>.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-property-get-int" role="function">
 <title>dbusmenu_menuitem_property_get_int ()</title>
@@ -835,13 +759,10 @@ Look up a property on <parameter>mi</parameter> and return the value of it if
 	it exits.  Returns zero if the property doesn't exist.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to look for the property on.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to look for the property on.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>property</parameter>&#160;:</term>
-<listitem><simpara>The property to grab.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> The value of the property or zero.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The property to grab.</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The value of the property or zero.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-property-exist" role="function">
 <title>dbusmenu_menuitem_property_exist ()</title>
@@ -849,16 +770,7 @@ Look up a property on <parameter>mi</parameter> and return the value of it if
 <programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_exist    (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
                                                          <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);</programlisting>
 <para>
-</para><variablelist role="params">
-<varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>property</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
+</para></refsect2>
 <refsect2 id="dbusmenu-menuitem-properties-list" role="function">
 <title>dbusmenu_menuitem_properties_list ()</title>
 <indexterm zone="dbusmenu-menuitem-properties-list"><primary>dbusmenu_menuitem_properties_list</primary></indexterm>
@@ -870,10 +782,8 @@ This functiong gets a list of the names of all the properties
 	<link linkend="g-list-free"><function>g_list_free()</function></link> when the calling function is done with it.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to list the properties on
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A list of strings or NULL if there are none.
-</simpara></listitem></varlistentry>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to list the properties on</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A list of strings or NULL if there are none.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-properties-copy" role="function">
 <title>dbusmenu_menuitem_properties_copy ()</title>
@@ -888,11 +798,9 @@ This function takes the properties of a <link linkend="DbusmenuMenuitem"><type>D
 	to destroy the created <link linkend="GHashTable"><type>GHashTable</type></link>.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> that we're interested in the properties of
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> A brand new <link linkend="GHashTable"><type>GHashTable</type></link> that contains all of the
-		properties that are on this <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> <parameter>mi</parameter>.
-</simpara></listitem></varlistentry>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> that we're interested in the properties of</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A brand new <link linkend="GHashTable"><type>GHashTable</type></link> that contains all of the
+properties that are on this <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> <parameter>mi</parameter>.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-property-remove" role="function">
 <title>dbusmenu_menuitem_property_remove ()</title>
@@ -903,11 +811,9 @@ This function takes the properties of a <link linkend="DbusmenuMenuitem"><type>D
 Removes a property from the menuitem.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to remove the property on.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to remove the property on.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>property</parameter>&#160;:</term>
-<listitem><simpara>The property to look for.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The property to look for.</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-set-root" role="function">
 <title>dbusmenu_menuitem_set_root ()</title>
@@ -919,11 +825,9 @@ This function sets the internal value of whether this is a
 	root node or not.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set whether it's root
-</simpara></listitem></varlistentry>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set whether it's root</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>root</parameter>&#160;:</term>
-<listitem><simpara>Whether <parameter>mi</parameter> is a root node or not
-</simpara></listitem></varlistentry>
+<listitem><simpara>Whether <parameter>mi</parameter> is a root node or not</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-get-root" role="function">
 <title>dbusmenu_menuitem_get_root ()</title>
@@ -934,16 +838,14 @@ This function returns the internal value of whether this is a
 	root node or not.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to see whether it's root
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara> <link linkend="TRUE:CAPS"><type>TRUE</type></link> if this is a root node
-</simpara></listitem></varlistentry>
+<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to see whether it's root</simpara></listitem></varlistentry>
+<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara><link linkend="TRUE:CAPS"><type>TRUE</type></link> if this is a root node</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-foreach" role="function">
 <title>dbusmenu_menuitem_foreach ()</title>
 <indexterm zone="dbusmenu-menuitem-foreach"><primary>dbusmenu_menuitem_foreach</primary></indexterm>
 <programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_menuitem_foreach           (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
-                                                         <parameter><link linkend="void"><type>void</type></link> (funcDbusmenuMenuitem * mi, gpointer data) ()</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> (*func) (DbusmenuMenuitem * mi, gpointer data)</parameter>,
                                                          <parameter><link linkend="gpointer"><type>gpointer</type></link> data</parameter>);</programlisting>
 <para>
 This calls the function <parameter>func</parameter> on this menu item and all
@@ -952,10 +854,11 @@ This calls the function <parameter>func</parameter> on this menu item and all
 	called on the whole tree.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenItem"><type>DbusmenItem</type></link> to start from
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenItem"><type>DbusmenItem</type></link> to start from</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>func</parameter>&#160;:</term>
+<listitem><simpara>Function to call on every node in the tree</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara> User data to pass to the function. <emphasis role="annotation">[closure]</emphasis></simpara></listitem></varlistentry>
+<listitem><simpara>User data to pass to the function. <emphasis role="annotation">[<acronym>closure</acronym>]</emphasis></simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-handle-event" role="function">
 <title>dbusmenu_menuitem_handle_event ()</title>
@@ -980,24 +883,18 @@ This function is called to create an event.  It is likely
 	reason not to.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to send the signal on.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to send the signal on.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>name</parameter>&#160;:</term>
-<listitem><simpara>The name of the signal
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>value</parameter>&#160;:</term>
-<listitem><simpara>
-</simpara></listitem></varlistentry>
+<listitem><simpara>The name of the signal</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>timestamp</parameter>&#160;:</term>
-<listitem><simpara>The timestamp of when the event happened
-</simpara></listitem></varlistentry>
+<listitem><simpara>The timestamp of when the event happened</simpara></listitem></varlistentry>
 </variablelist></refsect2>
 <refsect2 id="dbusmenu-menuitem-send-about-to-show" role="function">
 <title>dbusmenu_menuitem_send_about_to_show ()</title>
 <indexterm zone="dbusmenu-menuitem-send-about-to-show"><primary>dbusmenu_menuitem_send_about_to_show</primary></indexterm>
 <programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_menuitem_send_about_to_show
                                                         (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *mi</parameter>,
-                                                         <parameter><link linkend="void"><type>void</type></link> (cbDbusmenuMenuitem * mi, gpointer user_data) ()</parameter>,
+                                                         <parameter><link linkend="void"><type>void</type></link> (*cb) (DbusmenuMenuitem * mi, gpointer user_data)</parameter>,
                                                          <parameter><link linkend="gpointer"><type>gpointer</type></link> cb_data</parameter>);</programlisting>
 <para>
 This function is used to send the even that the submenu
@@ -1006,10 +903,11 @@ This function is used to send the even that the submenu
 	called if possible.
 </para><variablelist role="params">
 <varlistentry><term><parameter>mi</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to send the signal on.
-</simpara></listitem></varlistentry>
+<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to send the signal on.</simpara></listitem></varlistentry>
+<varlistentry><term><parameter>cb</parameter>&#160;:</term>
+<listitem><simpara>Callback to call when the call has returned.</simpara></listitem></varlistentry>
 <varlistentry><term><parameter>cb_data</parameter>&#160;:</term>
-<listitem><simpara> Data to pass to the callback. <emphasis role="annotation">[closure]</emphasis></simpara></listitem></varlistentry>
+<listitem><simpara>Data to pass to the callback. <emphasis role="annotation">[<acronym>closure</acronym>]</emphasis></simpara></listitem></varlistentry>
 </variablelist></refsect2>
 
 </refsect1>