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/tmpl | |
| 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/tmpl')
5 files changed, 2 insertions, 10 deletions
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 ##### --> |