diff options
| author | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:19:53 +0200 |
|---|---|---|
| committer | Evgeni Golov <evgeni@debian.org> | 2010-07-14 10:19:53 +0200 |
| commit | 44e511fb4f72420180baf757179efe3d483a91ca (patch) | |
| tree | 32ebdba980ad21a3227526365e8ae61b64b5daaa /docs/libdbusmenu-glib/reference | |
| parent | 2404f2f70b5c1a110383b15694e5784cd2d6013c (diff) | |
| parent | 674342c670052bcfcc92b7638de9af482ae2a856 (diff) | |
| download | libdbusmenu-44e511fb4f72420180baf757179efe3d483a91ca.tar.gz libdbusmenu-44e511fb4f72420180baf757179efe3d483a91ca.tar.bz2 libdbusmenu-44e511fb4f72420180baf757179efe3d483a91ca.zip | |
Merge new upstreams and changes from Ubuntu.
* New upstream release.
∘ Protect against NULL nodes (LP: #602444)
∘ Remove extra warnings and messages
∘ Handle not having a session bus better (LP: #598715)
* New upstream release.
* Block building submenus on separators (LP: #598620)
* Adding more through JSON support for testing
* Fixing up value handling in dbusmenu-dumper
* debian/control, debian/libdbusmenu-jsonloader*install: Adding
two binary packages for the jsonloader test library.
Diffstat (limited to 'docs/libdbusmenu-glib/reference')
11 files changed, 8 insertions, 14 deletions
diff --git a/docs/libdbusmenu-glib/reference/html/ch01.html b/docs/libdbusmenu-glib/reference/html/ch01.html index 286064d..e313534 100644 --- a/docs/libdbusmenu-glib/reference/html/ch01.html +++ b/docs/libdbusmenu-glib/reference/html/ch01.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter" title="API"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id339465"></a>API</h2></div></div></div> +<a name="id390460"></a>API</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="libdbusmenu-glib-DbusmenuServer.html">DbusmenuServer</a></span><span class="refpurpose"></span> diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html index c924a0d..1b41d8b 100644 --- a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html +++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuClient.html @@ -455,6 +455,7 @@ This function connects into the type handling of the <a class="link" href="libdb <td><p><span class="term"><em class="parameter"><code>id</code></em> :</span></p></td> <td> <em class="parameter"><code>gpointer</code></em> user_data: +<em class="parameter"><code>gpointer</code></em> user_data: </td> </tr> <tr> diff --git a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html index 47f8f77..23a4e0d 100644 --- a/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html +++ b/docs/libdbusmenu-glib/reference/html/libdbusmenu-glib-DbusmenuMenuitem.html @@ -287,7 +287,7 @@ objects and handled appropriately. <hr> <div class="refsect2" title="DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY"> <a name="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS"></a><h3>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</h3> -<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "child-display" +<pre class="programlisting">#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "children-display" </pre> <p> </p> diff --git a/docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml b/docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml index b6039ee..53426a7 100644 --- a/docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml +++ b/docs/libdbusmenu-glib/reference/tmpl/client-menuitem.sgml @@ -9,13 +9,11 @@ DbusmenuClientMenuitem </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libdbusmenu-glib/reference/tmpl/client.sgml b/docs/libdbusmenu-glib/reference/tmpl/client.sgml index 23ebf50..c8264e3 100644 --- a/docs/libdbusmenu-glib/reference/tmpl/client.sgml +++ b/docs/libdbusmenu-glib/reference/tmpl/client.sgml @@ -9,13 +9,11 @@ DbusmenuClient </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> @@ -159,6 +157,7 @@ DbusmenuClient @client: @id: +@gpointer user_data: @gpointer user_data: @cb_data: diff --git a/docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml b/docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml index a56e503..c76017b 100644 --- a/docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml +++ b/docs/libdbusmenu-glib/reference/tmpl/menuitem-proxy.sgml @@ -9,13 +9,11 @@ DbusmenuMenuitemProxy </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml b/docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml index ff2f08a..ad26442 100644 --- a/docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml +++ b/docs/libdbusmenu-glib/reference/tmpl/menuitem.sgml @@ -9,13 +9,11 @@ DbusmenuMenuitem </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> @@ -507,6 +505,7 @@ DbusmenuMenuitem </para> @mi: +@DbusmenuMenuitem * mi, gpointer data: @DbusmenuMenuitem * mi, gpointer data: @data: diff --git a/docs/libdbusmenu-glib/reference/tmpl/server.sgml b/docs/libdbusmenu-glib/reference/tmpl/server.sgml index 111e2eb..426acc6 100644 --- a/docs/libdbusmenu-glib/reference/tmpl/server.sgml +++ b/docs/libdbusmenu-glib/reference/tmpl/server.sgml @@ -9,13 +9,11 @@ DbusmenuServer </para> - <!-- ##### SECTION See_Also ##### --> <para> </para> - <!-- ##### SECTION Stability_Level ##### --> diff --git a/docs/libdbusmenu-glib/reference/version.xml b/docs/libdbusmenu-glib/reference/version.xml index 1c09c74..c2c0004 100644 --- a/docs/libdbusmenu-glib/reference/version.xml +++ b/docs/libdbusmenu-glib/reference/version.xml @@ -1 +1 @@ -0.3.3 +0.3.5 diff --git a/docs/libdbusmenu-glib/reference/xml/client.xml b/docs/libdbusmenu-glib/reference/xml/client.xml index 19e5767..b16de17 100644 --- a/docs/libdbusmenu-glib/reference/xml/client.xml +++ b/docs/libdbusmenu-glib/reference/xml/client.xml @@ -342,6 +342,7 @@ This function connects into the type handling of the <link linkend="DbusmenuClie <varlistentry><term><parameter>id</parameter> :</term> <listitem><simpara> <parameter>gpointer</parameter> user_data: +<parameter>gpointer</parameter> user_data: </simpara></listitem></varlistentry> <varlistentry><term><parameter>cb_data</parameter> :</term> <listitem><simpara> diff --git a/docs/libdbusmenu-glib/reference/xml/menuitem.xml b/docs/libdbusmenu-glib/reference/xml/menuitem.xml index e86d3c1..44b7a51 100644 --- a/docs/libdbusmenu-glib/reference/xml/menuitem.xml +++ b/docs/libdbusmenu-glib/reference/xml/menuitem.xml @@ -257,7 +257,7 @@ objects and handled appropriately. <refsect2 id="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS" role="macro"> <title>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</title> <indexterm zone="DBUSMENU-MENUITEM-PROP-CHILD-DISPLAY:CAPS"><primary>DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY</primary></indexterm> -<programlisting>#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "child-display" +<programlisting>#define DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY "children-display" </programlisting> <para> </para></refsect2> |