New upstream release.

∘ Fixing distcheck
∘ Grouping Property Change events into a single DBus signal
∘ Removing XML from the GetLayout function
∘ Clean up icon handling in the parser (LP: #715864)
∘ Fixing signatures on dbusmenu-dumper

6 files changed, 0 insertions, 574 deletions

diff --git a/docs/libdbusmenu-gtk/reference/xml/api-index-deprecated.xml b/docs/libdbusmenu-gtk/reference/xml/api-index-deprecated.xml
deleted file mode 100644
index 8ec0fe4..0000000
--- a/docs/libdbusmenu-gtk/reference/xml/api-index-deprecated.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE indexdiv PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<indexdiv>
-</indexdiv>
diff --git a/docs/libdbusmenu-gtk/reference/xml/api-index-full.xml b/docs/libdbusmenu-gtk/reference/xml/api-index-full.xml
deleted file mode 100644
index 0f97ad8..0000000
--- a/docs/libdbusmenu-gtk/reference/xml/api-index-full.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE indexdiv PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<indexdiv>
-<indexdiv><title>G</title>
-<indexentry><primaryie linkends="DbusmenuGtkClientClass"><link linkend="DbusmenuGtkClientClass">DbusmenuGtkClientClass</link>, struct in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
-<indexentry><primaryie linkends="DbusmenuGtkClientPrivate"><link linkend="DbusmenuGtkClientPrivate">DbusmenuGtkClientPrivate</link>, struct in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-gtkclient-get-accel-group"><link linkend="dbusmenu-gtkclient-get-accel-group">dbusmenu_gtkclient_get_accel_group</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-gtkclient-menuitem-get"><link linkend="dbusmenu-gtkclient-menuitem-get">dbusmenu_gtkclient_menuitem_get</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-gtkclient-menuitem-get-submenu"><link linkend="dbusmenu-gtkclient-menuitem-get-submenu">dbusmenu_gtkclient_menuitem_get_submenu</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-gtkclient-new"><link linkend="dbusmenu-gtkclient-new">dbusmenu_gtkclient_new</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-gtkclient-newitem-base"><link linkend="dbusmenu-gtkclient-newitem-base">dbusmenu_gtkclient_newitem_base</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-gtkclient-set-accel-group"><link linkend="dbusmenu-gtkclient-set-accel-group">dbusmenu_gtkclient_set_accel_group</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
-<indexentry><primaryie linkends="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS"><link linkend="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS">DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED</link>, macro in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
-<indexentry><primaryie linkends="DBUSMENU-GTKCLIENT-TYPE:CAPS"><link linkend="DBUSMENU-GTKCLIENT-TYPE:CAPS">DBUSMENU_GTKCLIENT_TYPE</link>, macro in <link linkend="libdbusmenu-gtk-DbusmenuGtkClient">DbusmenuGtkClient</link></primaryie></indexentry>
-<indexentry><primaryie linkends="DbusmenuGtkMenuClass"><link linkend="DbusmenuGtkMenuClass">DbusmenuGtkMenuClass</link>, struct in <link linkend="libdbusmenu-gtk-DbusmenuGtkMenu">DbusmenuGtkMenu</link></primaryie></indexentry>
-<indexentry><primaryie linkends="DbusmenuGtkMenuPrivate"><link linkend="DbusmenuGtkMenuPrivate">DbusmenuGtkMenuPrivate</link>, struct in <link linkend="libdbusmenu-gtk-DbusmenuGtkMenu">DbusmenuGtkMenu</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-gtkmenu-get-client"><link linkend="dbusmenu-gtkmenu-get-client">dbusmenu_gtkmenu_get_client</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkMenu">DbusmenuGtkMenu</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-gtkmenu-new"><link linkend="dbusmenu-gtkmenu-new">dbusmenu_gtkmenu_new</link>, function in <link linkend="libdbusmenu-gtk-DbusmenuGtkMenu">DbusmenuGtkMenu</link></primaryie></indexentry>
-<indexentry><primaryie linkends="DBUSMENU-GTKMENU-TYPE:CAPS"><link linkend="DBUSMENU-GTKMENU-TYPE:CAPS">DBUSMENU_GTKMENU_TYPE</link>, macro in <link linkend="libdbusmenu-gtk-DbusmenuGtkMenu">DbusmenuGtkMenu</link></primaryie></indexentry>
-</indexdiv>
-<indexdiv><title>M</title>
-<indexentry><primaryie linkends="dbusmenu-menuitem-property-get-image"><link linkend="dbusmenu-menuitem-property-get-image">dbusmenu_menuitem_property_get_image</link>, function in <link linkend="libdbusmenu-gtk-menuitem">menuitem</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-menuitem-property-get-shortcut"><link linkend="dbusmenu-menuitem-property-get-shortcut">dbusmenu_menuitem_property_get_shortcut</link>, function in <link linkend="libdbusmenu-gtk-menuitem">menuitem</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-menuitem-property-set-image"><link linkend="dbusmenu-menuitem-property-set-image">dbusmenu_menuitem_property_set_image</link>, function in <link linkend="libdbusmenu-gtk-menuitem">menuitem</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-menuitem-property-set-shortcut"><link linkend="dbusmenu-menuitem-property-set-shortcut">dbusmenu_menuitem_property_set_shortcut</link>, function in <link linkend="libdbusmenu-gtk-menuitem">menuitem</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-menuitem-property-set-shortcut-menuitem"><link linkend="dbusmenu-menuitem-property-set-shortcut-menuitem">dbusmenu_menuitem_property_set_shortcut_menuitem</link>, function in <link linkend="libdbusmenu-gtk-menuitem">menuitem</link></primaryie></indexentry>
-<indexentry><primaryie linkends="dbusmenu-menuitem-property-set-shortcut-string"><link linkend="dbusmenu-menuitem-property-set-shortcut-string">dbusmenu_menuitem_property_set_shortcut_string</link>, function in <link linkend="libdbusmenu-gtk-menuitem">menuitem</link></primaryie></indexentry>
-</indexdiv>
-</indexdiv>
diff --git a/docs/libdbusmenu-gtk/reference/xml/client.xml b/docs/libdbusmenu-gtk/reference/xml/client.xml
deleted file mode 100644
index 6efe10a..0000000
--- a/docs/libdbusmenu-gtk/reference/xml/client.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<refentry id="libdbusmenu-gtk-DbusmenuGtkClient">
-<refmeta>
-<refentrytitle role="top_of_page" id="libdbusmenu-gtk-DbusmenuGtkClient.top_of_page">DbusmenuGtkClient</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>
-  LIBDBUSMENU-GTK Library
-</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>DbusmenuGtkClient</refname>
-<refpurpose></refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="libdbusmenu-gtk-DbusmenuGtkClient.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis>#define             <link linkend="DBUSMENU-GTKCLIENT-TYPE:CAPS">DBUSMENU_GTKCLIENT_TYPE</link>
-#define             <link linkend="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS">DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED</link>
-                    <link linkend="DbusmenuGtkClientPrivate">DbusmenuGtkClientPrivate</link>;
-struct              <link linkend="DbusmenuGtkClientClass">DbusmenuGtkClientClass</link>;
-<link linkend="DbusmenuGtkClient"><returnvalue>DbusmenuGtkClient</returnvalue></link> *  <link linkend="dbusmenu-gtkclient-new">dbusmenu_gtkclient_new</link>             (<parameter><link linkend="gchar"><type>gchar</type></link> *dbus_name</parameter>,
-                                                         <parameter><link linkend="gchar"><type>gchar</type></link> *dbus_object</parameter>);
-<link linkend="GtkMenuItem"><returnvalue>GtkMenuItem</returnvalue></link> *       <link linkend="dbusmenu-gtkclient-menuitem-get">dbusmenu_gtkclient_menuitem_get</link>     (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
-                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>);
-<link linkend="GtkMenu"><returnvalue>GtkMenu</returnvalue></link> *           <link linkend="dbusmenu-gtkclient-menuitem-get-submenu">dbusmenu_gtkclient_menuitem_get_submenu</link>
-                                                        (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
-                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-gtkclient-set-accel-group">dbusmenu_gtkclient_set_accel_group</link>  (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
-                                                         <parameter><link linkend="GtkAccelGroup"><type>GtkAccelGroup</type></link> *agroup</parameter>);
-<link linkend="GtkAccelGroup"><returnvalue>GtkAccelGroup</returnvalue></link> *     <link linkend="dbusmenu-gtkclient-get-accel-group">dbusmenu_gtkclient_get_accel_group</link>  (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-gtkclient-newitem-base">dbusmenu_gtkclient_newitem_base</link>     (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
-                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>,
-                                                         <parameter><link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> *gmi</parameter>,
-                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *parent</parameter>);
-</synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="libdbusmenu-gtk-DbusmenuGtkClient.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-</para>
-</refsect1>
-<refsect1 id="libdbusmenu-gtk-DbusmenuGtkClient.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="DBUSMENU-GTKCLIENT-TYPE:CAPS" role="macro">
-<title>DBUSMENU_GTKCLIENT_TYPE</title>
-<indexterm zone="DBUSMENU-GTKCLIENT-TYPE:CAPS"><primary>DBUSMENU_GTKCLIENT_TYPE</primary></indexterm>
-<programlisting>#define DBUSMENU_GTKCLIENT_TYPE            (dbusmenu_gtkclient_get_type ())
-</programlisting>
-<para>
-</para></refsect2>
-<refsect2 id="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS" role="macro">
-<title>DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED</title>
-<indexterm zone="DBUSMENU-GTKCLIENT-SIGNAL-ROOT-CHANGED:CAPS"><primary>DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED</primary></indexterm>
-<programlisting>#define DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED  DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED
-</programlisting>
-<para>
-</para></refsect2>
-<refsect2 id="DbusmenuGtkClientPrivate" role="struct">
-<title>DbusmenuGtkClientPrivate</title>
-<indexterm zone="DbusmenuGtkClientPrivate"><primary>DbusmenuGtkClientPrivate</primary></indexterm>
-<programlisting>typedef struct _DbusmenuGtkClientPrivate DbusmenuGtkClientPrivate;</programlisting>
-<para>
-</para></refsect2>
-<refsect2 id="DbusmenuGtkClientClass" role="struct">
-<title>struct DbusmenuGtkClientClass</title>
-<indexterm zone="DbusmenuGtkClientClass"><primary>DbusmenuGtkClientClass</primary></indexterm>
-<programlisting>struct DbusmenuGtkClientClass {
-	DbusmenuClientClass parent_class;
-
-	/* Signals */
-	void (*root_changed) (DbusmenuMenuitem * newroot);
-
-	/*&lt; Private &gt;*/
-	void (*reserved1) (void);
-	void (*reserved2) (void);
-	void (*reserved3) (void);
-	void (*reserved4) (void);
-	void (*reserved5) (void);
-	void (*reserved6) (void);
-};
-</programlisting>
-<variablelist role="struct">
-<varlistentry><term><link linkend="DbusmenuClientClass"><type>DbusmenuClientClass</type></link>&#160;<structfield id="DbusmenuGtkClientClass.parent-class">parent_class</structfield>;</term>
-<listitem><simpara><link linkend="GtkMenuClass"><type>GtkMenuClass</type></link></simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkClientClass.root-changed">root_changed</structfield>&#160;()</term>
-<listitem><simpara></simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkClientClass.reserved1">reserved1</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkClientClass.reserved2">reserved2</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkClientClass.reserved3">reserved3</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkClientClass.reserved4">reserved4</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkClientClass.reserved5">reserved5</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkClientClass.reserved6">reserved6</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-gtkclient-new" role="function">
-<title>dbusmenu_gtkclient_new ()</title>
-<indexterm zone="dbusmenu-gtkclient-new"><primary>dbusmenu_gtkclient_new</primary></indexterm>
-<programlisting><link linkend="DbusmenuGtkClient"><returnvalue>DbusmenuGtkClient</returnvalue></link> *  dbusmenu_gtkclient_new             (<parameter><link linkend="gchar"><type>gchar</type></link> *dbus_name</parameter>,
-                                                         <parameter><link linkend="gchar"><type>gchar</type></link> *dbus_object</parameter>);</programlisting>
-<para>
-Creates a new <link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> object and creates a <link linkend="DbusmenuClient"><type>DbusmenuClient</type></link>
-	that connects across DBus to a <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link>.
-</para><variablelist role="params">
-<varlistentry><term><parameter>dbus_name</parameter>&#160;:</term>
-<listitem><simpara>Name of the <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link> on DBus</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A new <link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> sync'd with a server</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-gtkclient-menuitem-get" role="function">
-<title>dbusmenu_gtkclient_menuitem_get ()</title>
-<indexterm zone="dbusmenu-gtkclient-menuitem-get"><primary>dbusmenu_gtkclient_menuitem_get</primary></indexterm>
-<programlisting><link linkend="GtkMenuItem"><returnvalue>GtkMenuItem</returnvalue></link> *       dbusmenu_gtkclient_menuitem_get     (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
-                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>);</programlisting>
-<para>
-This grabs the <link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> that is associated with the
-	<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link>.
-</para><variablelist role="params">
-<varlistentry><term><parameter>client</parameter>&#160;:</term>
-<listitem><simpara>A <link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> with the item in it.</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>item</parameter>&#160;:</term>
-<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to get associated <link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> on.</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The <link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> that can be played with.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-gtkclient-menuitem-get-submenu" role="function">
-<title>dbusmenu_gtkclient_menuitem_get_submenu ()</title>
-<indexterm zone="dbusmenu-gtkclient-menuitem-get-submenu"><primary>dbusmenu_gtkclient_menuitem_get_submenu</primary></indexterm>
-<programlisting><link linkend="GtkMenu"><returnvalue>GtkMenu</returnvalue></link> *           dbusmenu_gtkclient_menuitem_get_submenu
-                                                        (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
-                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>);</programlisting>
-<para>
-This grabs the submenu associated with the menuitem.
-</para><variablelist role="params">
-<varlistentry><term><parameter>client</parameter>&#160;:</term>
-<listitem><simpara>A <link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> with the item in it.</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>item</parameter>&#160;:</term>
-<listitem><simpara><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to get associated <link linkend="GtkMenu"><type>GtkMenu</type></link> on.</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>The <link linkend="GtkMenu"><type>GtkMenu</type></link> if there is one.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-gtkclient-set-accel-group" role="function">
-<title>dbusmenu_gtkclient_set_accel_group ()</title>
-<indexterm zone="dbusmenu-gtkclient-set-accel-group"><primary>dbusmenu_gtkclient_set_accel_group</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_gtkclient_set_accel_group  (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
-                                                         <parameter><link linkend="GtkAccelGroup"><type>GtkAccelGroup</type></link> *agroup</parameter>);</programlisting>
-<para>
-Sets the acceleration group for the menu items with accelerators
-	on this client.
-</para><variablelist role="params">
-<varlistentry><term><parameter>client</parameter>&#160;:</term>
-<listitem><simpara>To set the group on</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>agroup</parameter>&#160;:</term>
-<listitem><simpara>The new acceleration group</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-gtkclient-get-accel-group" role="function">
-<title>dbusmenu_gtkclient_get_accel_group ()</title>
-<indexterm zone="dbusmenu-gtkclient-get-accel-group"><primary>dbusmenu_gtkclient_get_accel_group</primary></indexterm>
-<programlisting><link linkend="GtkAccelGroup"><returnvalue>GtkAccelGroup</returnvalue></link> *     dbusmenu_gtkclient_get_accel_group  (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>);</programlisting>
-<para>
-Gets the accel group for this client.
-</para><variablelist role="params">
-<varlistentry><term><parameter>client</parameter>&#160;:</term>
-<listitem><simpara>Client to query for an accelerator group</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>Either a valid group or <link linkend="NULL:CAPS"><type>NULL</type></link> on error or
-none set.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-gtkclient-newitem-base" role="function">
-<title>dbusmenu_gtkclient_newitem_base ()</title>
-<indexterm zone="dbusmenu-gtkclient-newitem-base"><primary>dbusmenu_gtkclient_newitem_base</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_gtkclient_newitem_base     (<parameter><link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> *client</parameter>,
-                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *item</parameter>,
-                                                         <parameter><link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> *gmi</parameter>,
-                                                         <parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *parent</parameter>);</programlisting>
-<para>
-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.
-</para>
-<para>
-	This also handles passing the "activate" signal back to the
-	<link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> side of thing.
-</para><variablelist role="params">
-<varlistentry><term><parameter>client</parameter>&#160;:</term>
-<listitem><simpara>The client handling everything on this connection</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>item</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to attach the GTK-isms to</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>gmi</parameter>&#160;:</term>
-<listitem><simpara>A <link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> representing the GTK world's view of this menuitem</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>parent</parameter>&#160;:</term>
-<listitem><simpara>The parent <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link></simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-</refentry>
diff --git a/docs/libdbusmenu-gtk/reference/xml/genericmenuitem.xml b/docs/libdbusmenu-gtk/reference/xml/genericmenuitem.xml
deleted file mode 100644
index 0ac5025..0000000
--- a/docs/libdbusmenu-gtk/reference/xml/genericmenuitem.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<refentry id="Genericmenuitem">
-<refmeta>
-<refentrytitle role="top_of_page" id="Genericmenuitem.top_of_page">Genericmenuitem</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>
-  LIBDBUSMENU-GTK Library
-</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>Genericmenuitem</refname>
-<refpurpose></refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="Genericmenuitem.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis></synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="Genericmenuitem.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-</para>
-</refsect1>
-<refsect1 id="Genericmenuitem.details" role="details">
-<title role="details.title">Details</title>
-
-</refsect1>
-
-</refentry>
diff --git a/docs/libdbusmenu-gtk/reference/xml/menu.xml b/docs/libdbusmenu-gtk/reference/xml/menu.xml
deleted file mode 100644
index 4513e23..0000000
--- a/docs/libdbusmenu-gtk/reference/xml/menu.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<refentry id="libdbusmenu-gtk-DbusmenuGtkMenu">
-<refmeta>
-<refentrytitle role="top_of_page" id="libdbusmenu-gtk-DbusmenuGtkMenu.top_of_page">DbusmenuGtkMenu</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>
-  LIBDBUSMENU-GTK Library
-</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>DbusmenuGtkMenu</refname>
-<refpurpose></refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="libdbusmenu-gtk-DbusmenuGtkMenu.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis>#define             <link linkend="DBUSMENU-GTKMENU-TYPE:CAPS">DBUSMENU_GTKMENU_TYPE</link>
-                    <link linkend="DbusmenuGtkMenuPrivate">DbusmenuGtkMenuPrivate</link>;
-struct              <link linkend="DbusmenuGtkMenuClass">DbusmenuGtkMenuClass</link>;
-<link linkend="DbusmenuGtkMenu"><returnvalue>DbusmenuGtkMenu</returnvalue></link> *   <link linkend="dbusmenu-gtkmenu-new">dbusmenu_gtkmenu_new</link>                (<parameter><link linkend="gchar"><type>gchar</type></link> *dbus_name</parameter>,
-                                                         <parameter><link linkend="gchar"><type>gchar</type></link> *dbus_object</parameter>);
-<link linkend="DbusmenuGtkClient"><returnvalue>DbusmenuGtkClient</returnvalue></link> *  <link linkend="dbusmenu-gtkmenu-get-client">dbusmenu_gtkmenu_get_client</link>        (<parameter><link linkend="DbusmenuGtkMenu"><type>DbusmenuGtkMenu</type></link> *menu</parameter>);
-</synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="libdbusmenu-gtk-DbusmenuGtkMenu.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-</para>
-</refsect1>
-<refsect1 id="libdbusmenu-gtk-DbusmenuGtkMenu.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="DBUSMENU-GTKMENU-TYPE:CAPS" role="macro">
-<title>DBUSMENU_GTKMENU_TYPE</title>
-<indexterm zone="DBUSMENU-GTKMENU-TYPE:CAPS"><primary>DBUSMENU_GTKMENU_TYPE</primary></indexterm>
-<programlisting>#define DBUSMENU_GTKMENU_TYPE            (dbusmenu_gtkmenu_get_type ())
-</programlisting>
-<para>
-</para></refsect2>
-<refsect2 id="DbusmenuGtkMenuPrivate" role="struct">
-<title>DbusmenuGtkMenuPrivate</title>
-<indexterm zone="DbusmenuGtkMenuPrivate"><primary>DbusmenuGtkMenuPrivate</primary></indexterm>
-<programlisting>typedef struct _DbusmenuGtkMenuPrivate DbusmenuGtkMenuPrivate;</programlisting>
-<para>
-</para></refsect2>
-<refsect2 id="DbusmenuGtkMenuClass" role="struct">
-<title>struct DbusmenuGtkMenuClass</title>
-<indexterm zone="DbusmenuGtkMenuClass"><primary>DbusmenuGtkMenuClass</primary></indexterm>
-<programlisting>struct DbusmenuGtkMenuClass {
-	GtkMenuClass parent_class;
-
-	/*&lt; Private &gt;*/
-	void (*reserved1) (void);
-	void (*reserved2) (void);
-	void (*reserved3) (void);
-	void (*reserved4) (void);
-	void (*reserved5) (void);
-	void (*reserved6) (void);
-};
-</programlisting>
-<variablelist role="struct">
-<varlistentry><term><link linkend="GtkMenuClass"><type>GtkMenuClass</type></link>&#160;<structfield id="DbusmenuGtkMenuClass.parent-class">parent_class</structfield>;</term>
-<listitem><simpara><link linkend="GtkMenuClass"><type>GtkMenuClass</type></link></simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkMenuClass.reserved1">reserved1</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkMenuClass.reserved2">reserved2</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkMenuClass.reserved3">reserved3</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkMenuClass.reserved4">reserved4</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkMenuClass.reserved5">reserved5</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-<varlistentry><term><structfield id="DbusmenuGtkMenuClass.reserved6">reserved6</structfield>&#160;()</term>
-<listitem><simpara>Reserved for future use.</simpara></listitem>
-</varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-gtkmenu-new" role="function">
-<title>dbusmenu_gtkmenu_new ()</title>
-<indexterm zone="dbusmenu-gtkmenu-new"><primary>dbusmenu_gtkmenu_new</primary></indexterm>
-<programlisting><link linkend="DbusmenuGtkMenu"><returnvalue>DbusmenuGtkMenu</returnvalue></link> *   dbusmenu_gtkmenu_new                (<parameter><link linkend="gchar"><type>gchar</type></link> *dbus_name</parameter>,
-                                                         <parameter><link linkend="gchar"><type>gchar</type></link> *dbus_object</parameter>);</programlisting>
-<para>
-Creates a new <link linkend="DbusmenuGtkMenu"><type>DbusmenuGtkMenu</type></link> object and creates a <link linkend="DbusmenuClient"><type>DbusmenuClient</type></link>
-	that connects across DBus to a <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link>.
-</para><variablelist role="params">
-<varlistentry><term><parameter>dbus_name</parameter>&#160;:</term>
-<listitem><simpara>Name of the <link linkend="DbusmenuServer"><type>DbusmenuServer</type></link> on DBus</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A new <link linkend="DbusmenuGtkMenu"><type>DbusmenuGtkMenu</type></link> sync'd with a server</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-gtkmenu-get-client" role="function">
-<title>dbusmenu_gtkmenu_get_client ()</title>
-<indexterm zone="dbusmenu-gtkmenu-get-client"><primary>dbusmenu_gtkmenu_get_client</primary></indexterm>
-<programlisting><link linkend="DbusmenuGtkClient"><returnvalue>DbusmenuGtkClient</returnvalue></link> *  dbusmenu_gtkmenu_get_client        (<parameter><link linkend="DbusmenuGtkMenu"><type>DbusmenuGtkMenu</type></link> *menu</parameter>);</programlisting>
-<para>
-An accessor for the client that this menu is using to
-	communicate with the server.
-</para><variablelist role="params">
-<varlistentry><term><parameter>menu</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuGtkMenu"><type>DbusmenuGtkMenu</type></link> to get the client from</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A valid <link linkend="DbusmenuGtkClient"><type>DbusmenuGtkClient</type></link> or NULL on error.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-</refentry>
diff --git a/docs/libdbusmenu-gtk/reference/xml/menuitem.xml b/docs/libdbusmenu-gtk/reference/xml/menuitem.xml
deleted file mode 100644
index 6af8086..0000000
--- a/docs/libdbusmenu-gtk/reference/xml/menuitem.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-]>
-<refentry id="libdbusmenu-gtk-menuitem">
-<refmeta>
-<refentrytitle role="top_of_page" id="libdbusmenu-gtk-menuitem.top_of_page">menuitem</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>
-  LIBDBUSMENU-GTK Library
-</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>menuitem</refname>
-<refpurpose></refpurpose>
-</refnamediv>
-
-<refsynopsisdiv id="libdbusmenu-gtk-menuitem.synopsis" role="synopsis">
-<title role="synopsis.title">Synopsis</title>
-
-<synopsis><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-property-set-image">dbusmenu_menuitem_property_set_image</link>
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
-                                                         <parameter>const <link linkend="GdkPixbuf"><type>GdkPixbuf</type></link> *data</parameter>);
-<link linkend="GdkPixbuf"><returnvalue>GdkPixbuf</returnvalue></link> *         <link linkend="dbusmenu-menuitem-property-get-image">dbusmenu_menuitem_property_get_image</link>
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);
-<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-property-set-shortcut">dbusmenu_menuitem_property_set_shortcut</link>
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> key</parameter>,
-                                                         <parameter><link linkend="GdkModifierType"><type>GdkModifierType</type></link> modifier</parameter>);
-<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-property-set-shortcut-string">dbusmenu_menuitem_property_set_shortcut_string</link>
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *shortcut</parameter>);
-<link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            <link linkend="dbusmenu-menuitem-property-set-shortcut-menuitem">dbusmenu_menuitem_property_set_shortcut_menuitem</link>
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter>const <link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> *gmi</parameter>);
-<link linkend="void"><returnvalue>void</returnvalue></link>                <link linkend="dbusmenu-menuitem-property-get-shortcut">dbusmenu_menuitem_property_get_shortcut</link>
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> *key</parameter>,
-                                                         <parameter><link linkend="GdkModifierType"><type>GdkModifierType</type></link> *modifiers</parameter>);
-</synopsis>
-</refsynopsisdiv>
-
-<refsect1 id="libdbusmenu-gtk-menuitem.description" role="desc">
-<title role="desc.title">Description</title>
-<para>
-</para>
-</refsect1>
-<refsect1 id="libdbusmenu-gtk-menuitem.details" role="details">
-<title role="details.title">Details</title>
-<refsect2 id="dbusmenu-menuitem-property-set-image" role="function">
-<title>dbusmenu_menuitem_property_set_image ()</title>
-<indexterm zone="dbusmenu-menuitem-property-set-image"><primary>dbusmenu_menuitem_property_set_image</primary></indexterm>
-<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_set_image
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>,
-                                                         <parameter>const <link linkend="GdkPixbuf"><type>GdkPixbuf</type></link> *data</parameter>);</programlisting>
-<para>
-This function takes the pixbuf that is stored in <parameter>data</parameter> and
-	turns it into a base64 encoded PNG so that it can be placed
-	onto a standard <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> property.
-</para><variablelist role="params">
-<varlistentry><term><parameter>menuitem</parameter>&#160;:</term>
-<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>
-<varlistentry><term><parameter>data</parameter>&#160;:</term>
-<listitem><simpara>The image to place on the property.</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>Whether the function was able to set the property
-or not.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-menuitem-property-get-image" role="function">
-<title>dbusmenu_menuitem_property_get_image ()</title>
-<indexterm zone="dbusmenu-menuitem-property-get-image"><primary>dbusmenu_menuitem_property_get_image</primary></indexterm>
-<programlisting><link linkend="GdkPixbuf"><returnvalue>GdkPixbuf</returnvalue></link> *         dbusmenu_menuitem_property_get_image
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *property</parameter>);</programlisting>
-<para>
-This function looks on the menu item for a property by the
-	name of <parameter>property</parameter>.  If one exists it tries to turn it into
-	a <link linkend="GdkPixbuf"><type>GdkPixbuf</type></link>.  It assumes that the property is a base64 encoded
-	PNG file like the one created by <link linkend="dbusmenu-menuite-property-set-image"><type>dbusmenu_menuite_property_set_image</type></link>.
-</para><variablelist role="params">
-<varlistentry><term><parameter>menuitem</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuite"><type>DbusmenuMenuite</type></link> to look for the property on</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>property</parameter>&#160;:</term>
-<listitem><simpara>The name of the property to look for.</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>A pixbuf or <link linkend="NULL:CAPS"><type>NULL</type></link> to signal error.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-menuitem-property-set-shortcut" role="function">
-<title>dbusmenu_menuitem_property_set_shortcut ()</title>
-<indexterm zone="dbusmenu-menuitem-property-set-shortcut"><primary>dbusmenu_menuitem_property_set_shortcut</primary></indexterm>
-<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_set_shortcut
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> key</parameter>,
-                                                         <parameter><link linkend="GdkModifierType"><type>GdkModifierType</type></link> modifier</parameter>);</programlisting>
-<para>
-Takes the modifer described by <parameter>key</parameter> and <parameter>modifier</parameter> and places that into
-	the format sending across Dbus for shortcuts.
-</para><variablelist role="params">
-<varlistentry><term><parameter>menuitem</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the shortcut on</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>The keycode of the key to send</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>modifier</parameter>&#160;:</term>
-<listitem><simpara>A bitmask of modifiers used to activate the item</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>Whether it was successful at setting the property.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-menuitem-property-set-shortcut-string" role="function">
-<title>dbusmenu_menuitem_property_set_shortcut_string ()</title>
-<indexterm zone="dbusmenu-menuitem-property-set-shortcut-string"><primary>dbusmenu_menuitem_property_set_shortcut_string</primary></indexterm>
-<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_set_shortcut_string
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter>const <link linkend="gchar"><type>gchar</type></link> *shortcut</parameter>);</programlisting>
-<para>
-This function takes a GTK shortcut string as defined in
-	<link linkend="gtk-accelerator-parse"><type>gtk_accelerator_parse</type></link> and turns that into the information
-	required to send it over DBusmenu.
-</para><variablelist role="params">
-<varlistentry><term><parameter>menuitem</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the shortcut on</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>shortcut</parameter>&#160;:</term>
-<listitem><simpara>String describing the shortcut</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>Whether it was successful at setting the property.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-menuitem-property-set-shortcut-menuitem" role="function">
-<title>dbusmenu_menuitem_property_set_shortcut_menuitem ()</title>
-<indexterm zone="dbusmenu-menuitem-property-set-shortcut-menuitem"><primary>dbusmenu_menuitem_property_set_shortcut_menuitem</primary></indexterm>
-<programlisting><link linkend="gboolean"><returnvalue>gboolean</returnvalue></link>            dbusmenu_menuitem_property_set_shortcut_menuitem
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter>const <link linkend="GtkMenuItem"><type>GtkMenuItem</type></link> *gmi</parameter>);</programlisting>
-<para>
-Takes the shortcut that is installed on a menu item and calls
-	<link linkend="dbusmenu-menuitem-property-set-shortcut"><type>dbusmenu_menuitem_property_set_shortcut</type></link> with it.  It also sets
-	up listeners to watch it change.
-</para><variablelist role="params">
-<varlistentry><term><parameter>menuitem</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to set the shortcut on</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>gmi</parameter>&#160;:</term>
-<listitem><simpara>A menu item to steal the shortcut off of</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&#160;:</term><listitem><simpara>Whether it was successful at setting the property.</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2 id="dbusmenu-menuitem-property-get-shortcut" role="function">
-<title>dbusmenu_menuitem_property_get_shortcut ()</title>
-<indexterm zone="dbusmenu-menuitem-property-get-shortcut"><primary>dbusmenu_menuitem_property_get_shortcut</primary></indexterm>
-<programlisting><link linkend="void"><returnvalue>void</returnvalue></link>                dbusmenu_menuitem_property_get_shortcut
-                                                        (<parameter><link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> *menuitem</parameter>,
-                                                         <parameter><link linkend="guint"><type>guint</type></link> *key</parameter>,
-                                                         <parameter><link linkend="GdkModifierType"><type>GdkModifierType</type></link> *modifiers</parameter>);</programlisting>
-<para>
-This function gets a GTK shortcut as a key and a mask
-	for use to set the accelerators.
-</para><variablelist role="params">
-<varlistentry><term><parameter>menuitem</parameter>&#160;:</term>
-<listitem><simpara>The <link linkend="DbusmenuMenuitem"><type>DbusmenuMenuitem</type></link> to get the shortcut off</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>key</parameter>&#160;:</term>
-<listitem><simpara>Location to put the key value</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-</refentry>