diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-27 14:12:16 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-27 14:12:16 -0600 |
| commit | b3088525e0497a660667dc4069554274e95ec498 (patch) | |
| tree | 907dd3c614e08e4ab107b44ae3ce7c5ca874c185 /docs | |
| parent | 3393d799cd65efdfea2c882b775e58f15a205844 (diff) | |
| parent | db78a405701a56b3df9359293dd944a5d7b8bbe7 (diff) | |
| download | libdbusmenu-b3088525e0497a660667dc4069554274e95ec498.tar.gz libdbusmenu-b3088525e0497a660667dc4069554274e95ec498.tar.bz2 libdbusmenu-b3088525e0497a660667dc4069554274e95ec498.zip | |
* Upstream Merge
* Fixing setting toggle to a boolean
* Fixing some memory leaks
* Fixing signatures in GetChildren
* Look for the serializable menuitems and use their
build functions
* Fix critical message from being printed
* Fixing shutdown messages on destruction
* Adding a parser
* Adding a serializable menu item
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libdbusmenu-gtk/reference/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/libdbusmenu-gtk/reference/Makefile.am b/docs/libdbusmenu-gtk/reference/Makefile.am index 6e44a23..191d68e 100644 --- a/docs/libdbusmenu-gtk/reference/Makefile.am +++ b/docs/libdbusmenu-gtk/reference/Makefile.am @@ -54,7 +54,7 @@ CFILE_GLOB=$(top_srcdir)/libdbusmenu-gtk/*.c # Header files to ignore when scanning. # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h -IGNORE_HFILES= +IGNORE_HFILES=genericmenuitem.h # Images to copy into HTML directory. # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png diff --git a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml index ae9ab07..ec6b82f 100644 --- a/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml +++ b/docs/libdbusmenu-gtk/reference/libdbusmenu-gtk-docs.sgml @@ -13,8 +13,8 @@ <title>API</title> <xi:include href="xml/menu.xml"/> <xi:include href="xml/client.xml"/> - <xi:include href="xml/genericmenuitem.xml"/> <xi:include href="xml/menuitem.xml"/> + <xi:include href="xml/serializablemenuitem.xml"/> </chapter> <chapter id="object-tree"> |