Catching up to trunk

2 files changed, 163 insertions, 1 deletions

diff --git a/docs/libdbusmenu-glib/reference/Makefile.am b/docs/libdbusmenu-glib/reference/Makefile.am
index e87f226..8018da2 100644
--- a/docs/libdbusmenu-glib/reference/Makefile.am
+++ b/docs/libdbusmenu-glib/reference/Makefile.am
@@ -47,7 +47,12 @@ CFILE_GLOB=$(top_srcdir)/libdbusmenu-glib/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=menuitem-marshal.h server-marshal.h menuitem-private.h
+IGNORE_HFILES= \
+	menuitem-marshal.h \
+	server-marshal.h \
+	menuitem-private.h \
+	dbusmenu-client.h \
+	dbusmenu-server.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-glib/reference/libdbusmenu-glib-sections.txt b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt
new file mode 100644
index 0000000..0186049
--- /dev/null
+++ b/docs/libdbusmenu-glib/reference/libdbusmenu-glib-sections.txt
@@ -0,0 +1,157 @@
+<SECTION>
+<FILE>client</FILE>
+<TITLE>DbusmenuClient</TITLE>
+DBUSMENU_CLIENT_SIGNAL_LAYOUT_UPDATED
+DBUSMENU_CLIENT_SIGNAL_ROOT_CHANGED
+DBUSMENU_CLIENT_SIGNAL_NEW_MENUITEM
+DBUSMENU_CLIENT_PROP_DBUS_NAME
+DBUSMENU_CLIENT_PROP_DBUS_OBJECT
+DBUSMENU_CLIENT_TYPES_DEFAULT
+DBUSMENU_CLIENT_TYPES_SEPARATOR
+DBUSMENU_CLIENT_TYPES_IMAGE
+DbusmenuClient
+DbusmenuClientClass
+DbusmenuClientTypeHandler
+dbusmenu_client_new
+dbusmenu_client_get_root
+dbusmenu_client_add_type_handler
+dbusmenu_client_send_event
+dbusmenu_client_send_about_to_show
+<SUBSECTION Standard>
+DBUSMENU_CLIENT
+DBUSMENU_IS_CLIENT
+DBUSMENU_TYPE_CLIENT
+dbusmenu_client_get_type
+DBUSMENU_CLIENT_CLASS
+DBUSMENU_IS_CLIENT_CLASS
+DBUSMENU_CLIENT_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>menuitem</FILE>
+<TITLE>DbusmenuMenuitem</TITLE>
+DBUSMENU_MENUITEM_SIGNAL_PROPERTY_CHANGED
+DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED
+DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED
+DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED
+DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED
+DBUSMENU_MENUITEM_SIGNAL_REALIZED
+DBUSMENU_MENUITEM_SIGNAL_REALIZED_ID
+DBUSMENU_MENUITEM_PROP_TYPE
+DBUSMENU_MENUITEM_PROP_VISIBLE
+DBUSMENU_MENUITEM_PROP_ENABLED
+DBUSMENU_MENUITEM_PROP_LABEL
+DBUSMENU_MENUITEM_PROP_ICON_NAME
+DBUSMENU_MENUITEM_PROP_ICON_DATA
+DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE
+DBUSMENU_MENUITEM_PROP_TOGGLE_STATE
+DBUSMENU_MENUITEM_PROP_CHILD_DISPLAY
+DBUSMENU_MENUITEM_TOGGLE_CHECK
+DBUSMENU_MENUITEM_TOGGLE_RADIO
+DBUSMENU_MENUITEM_TOGGLE_STATE_UNCHECKED
+DBUSMENU_MENUITEM_TOGGLE_STATE_CHECKED
+DBUSMENU_MENUITEM_TOGGLE_STATE_UNKNOWN
+DBUSMENU_MENUITEM_ICON_NAME_BLANK
+DBUSMENU_MENUITEM_CHILD_DISPLAY_SUBMENU
+DbusmenuMenuitem
+dbusmenu_menuitem_about_to_show_cb
+dbusmenu_menuitem_buildxml_slot_t
+DbusmenuMenuitemClass
+dbusmenu_menuitem_new
+dbusmenu_menuitem_new_with_id
+dbusmenu_menuitem_get_id
+dbusmenu_menuitem_get_children
+dbusmenu_menuitem_take_children
+dbusmenu_menuitem_get_position
+dbusmenu_menuitem_get_position_realized
+dbusmenu_menuitem_child_append
+dbusmenu_menuitem_child_prepend
+dbusmenu_menuitem_child_delete
+dbusmenu_menuitem_child_add_position
+dbusmenu_menuitem_child_reorder
+dbusmenu_menuitem_child_find
+dbusmenu_menuitem_find_id
+dbusmenu_menuitem_property_set
+dbusmenu_menuitem_property_set_value
+dbusmenu_menuitem_property_set_bool
+dbusmenu_menuitem_property_set_int
+dbusmenu_menuitem_property_get
+dbusmenu_menuitem_property_get_value
+dbusmenu_menuitem_property_get_bool
+dbusmenu_menuitem_property_get_int
+dbusmenu_menuitem_property_exist
+dbusmenu_menuitem_properties_list
+dbusmenu_menuitem_properties_copy
+dbusmenu_menuitem_property_remove
+dbusmenu_menuitem_set_root
+dbusmenu_menuitem_get_root
+dbusmenu_menuitem_foreach
+dbusmenu_menuitem_handle_event
+dbusmenu_menuitem_send_about_to_show
+<SUBSECTION Standard>
+DBUSMENU_MENUITEM
+DBUSMENU_IS_MENUITEM
+DBUSMENU_TYPE_MENUITEM
+dbusmenu_menuitem_get_type
+DBUSMENU_MENUITEM_CLASS
+DBUSMENU_IS_MENUITEM_CLASS
+DBUSMENU_MENUITEM_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>server</FILE>
+<TITLE>DbusmenuServer</TITLE>
+DBUSMENU_SERVER_SIGNAL_ID_PROP_UPDATE
+DBUSMENU_SERVER_SIGNAL_ID_UPDATE
+DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATED
+DBUSMENU_SERVER_SIGNAL_LAYOUT_UPDATE
+DBUSMENU_SERVER_PROP_DBUS_OBJECT
+DBUSMENU_SERVER_PROP_ROOT_NODE
+DBUSMENU_SERVER_PROP_VERSION
+DbusmenuServer
+DbusmenuServerClass
+dbusmenu_server_new
+dbusmenu_server_set_root
+<SUBSECTION Standard>
+DBUSMENU_SERVER
+DBUSMENU_IS_SERVER
+DBUSMENU_TYPE_SERVER
+dbusmenu_server_get_type
+DBUSMENU_SERVER_CLASS
+DBUSMENU_IS_SERVER_CLASS
+DBUSMENU_SERVER_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>client-menuitem</FILE>
+<TITLE>DbusmenuClientMenuitem</TITLE>
+DBUSMENU_CLIENT_MENUITEM_TYPE
+DbusmenuClientMenuitem
+DbusmenuClientMenuitemClass
+dbusmenu_client_menuitem_new
+<SUBSECTION Standard>
+DBUSMENU_CLIENT_MENUITEM
+DBUSMENU_IS_CLIENT_MENUITEM
+dbusmenu_client_menuitem_get_type
+DBUSMENU_CLIENT_MENUITEM_CLASS
+DBUSMENU_IS_CLIENT_MENUITEM_CLASS
+DBUSMENU_CLIENT_MENUITEM_GET_CLASS
+</SECTION>
+
+<SECTION>
+<FILE>menuitem-proxy</FILE>
+<TITLE>DbusmenuMenuitemProxy</TITLE>
+DbusmenuMenuitemProxy
+DbusmenuMenuitemProxyClass
+dbusmenu_menuitem_proxy_new
+dbusmenu_menuitem_proxy_get_wrapped
+<SUBSECTION Standard>
+DBUSMENU_MENUITEM_PROXY
+DBUSMENU_IS_MENUITEM_PROXY
+DBUSMENU_TYPE_MENUITEM_PROXY
+dbusmenu_menuitem_proxy_get_type
+DBUSMENU_MENUITEM_PROXY_CLASS
+DBUSMENU_IS_MENUITEM_PROXY_CLASS
+DBUSMENU_MENUITEM_PROXY_GET_CLASS
+</SECTION>
+