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/xml | |
| 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/xml')
| -rw-r--r-- | docs/libdbusmenu-glib/reference/xml/client.xml | 1 | ||||
| -rw-r--r-- | docs/libdbusmenu-glib/reference/xml/menuitem.xml | 2 |
2 files changed, 2 insertions, 1 deletions
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> |