diff options
author | David Zeuthen <davidz@redhat.com> | 2011-03-16 15:44:34 -0400 |
---|---|---|
committer | David Zeuthen <davidz@redhat.com> | 2011-03-16 15:44:34 -0400 |
commit | 2f0528b9e84a4dfcf4f83c106b2b81fccbacbd06 (patch) | |
tree | 45cd38354790978b1cb833956daed6a28f775803 | |
parent | 7b5a1f5831201cb12d2b7c2d8725eb45594bac1d (diff) |
Fix up docs
Signed-off-by: David Zeuthen <davidz@redhat.com>
-rw-r--r-- | doc/Makefile.am | 1 | ||||
-rw-r--r-- | doc/gen-docs.xml | 13 | ||||
-rw-r--r-- | doc/gen-sections.txt | 17 | ||||
-rw-r--r-- | src/gdbusobjectmanager.c | 2 | ||||
-rw-r--r-- | src/gdbusobjectproxy.h | 2 | ||||
-rw-r--r-- | src/gdbusproxymanager.c | 4 |
6 files changed, 21 insertions, 18 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 76de7c6..a4f827c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -18,6 +18,7 @@ CFILE_GLOB=$(top_srcdir)/src/*.c # Headers to ignore IGNORE_HFILES= \ util.h \ + test-generated.h \ $(NULL) # CFLAGS and LDFLAGS for compiling scan program. Only needed diff --git a/doc/gen-docs.xml b/doc/gen-docs.xml index fad502d..15fef5f 100644 --- a/doc/gen-docs.xml +++ b/doc/gen-docs.xml @@ -22,19 +22,6 @@ </part> <part> - <title>Generated API</title> - <xi:include href="xml/test-foobar.xml"/> - <xi:include href="xml/test-foobarfrobnicator.xml"/> - <xi:include href="xml/test-foobat.xml"/> - <xi:include href="xml/test-foobaz.xml"/> - <xi:include href="xml/test-foocomacmecoyote.xml"/> - <xi:include href="xml/test-foorocket.xml"/> - <xi:include href="xml/test-fooproxymanager.xml"/> - <xi:include href="xml/udisks-device.xml"/> - <xi:include href="xml/udisks-proxymanager.xml"/> - </part> - - <part> <title>Tools Reference</title> <xi:include href="gdbus-codegen.xml"/> </part> diff --git a/doc/gen-sections.txt b/doc/gen-sections.txt index 186e5d6..0f876fc 100644 --- a/doc/gen-sections.txt +++ b/doc/gen-sections.txt @@ -12,6 +12,11 @@ G_IS_DBUS_INTERFACE G_TYPE_DBUS_INTERFACE g_dbus_interface_get_type G_DBUS_INTERFACE_GET_IFACE +<SUBSECTION Private> +g_dbus_gvalue_to_gvariant +g_dbus_gvariant_to_gvalue +g_dbus_object_lookup_with_typecheck +g_dbus_object_peek_with_typecheck </SECTION> @@ -32,6 +37,8 @@ g_dbus_interface_stub_get_type G_DBUS_INTERFACE_STUB_CLASS G_IS_DBUS_INTERFACE_STUB_CLASS G_DBUS_INTERFACE_STUB_GET_CLASS +<SUBSECTION Private> +GDBusInterfaceStubPrivate </SECTION> <SECTION> @@ -64,6 +71,8 @@ g_dbus_object_proxy_get_type G_DBUS_OBJECT_PROXY_CLASS G_IS_DBUS_OBJECT_PROXY_CLASS G_DBUS_OBJECT_PROXY_GET_CLASS +<SUBSECTION Private> +GDBusObjectProxyPrivate </SECTION> <SECTION> @@ -85,6 +94,8 @@ g_dbus_object_stub_get_type G_DBUS_OBJECT_STUB_CLASS G_IS_DBUS_OBJECT_STUB_CLASS G_DBUS_OBJECT_STUB_GET_CLASS +<SUBSECTION Private> +GDBusObjectStubPrivate </SECTION> <SECTION> @@ -107,6 +118,8 @@ g_dbus_object_manager_get_type G_DBUS_OBJECT_MANAGER_CLASS G_IS_DBUS_OBJECT_MANAGER_CLASS G_DBUS_OBJECT_MANAGER_GET_CLASS +<SUBSECTION Private> +GDBusObjectManagerPrivate </SECTION> <SECTION> @@ -138,4 +151,8 @@ g_dbus_proxy_manager_get_type G_DBUS_PROXY_MANAGER_CLASS G_IS_DBUS_PROXY_MANAGER_CLASS G_DBUS_PROXY_MANAGER_GET_CLASS +<SUBSECTION Private> +GDBusProxyManagerPrivate +G_TYPE_DBUS_PROXY_MANAGER_FLAGS +g_dbus_proxy_manager_flags_get_type </SECTION> diff --git a/src/gdbusobjectmanager.c b/src/gdbusobjectmanager.c index c972165..1a762d8 100644 --- a/src/gdbusobjectmanager.c +++ b/src/gdbusobjectmanager.c @@ -500,7 +500,7 @@ g_dbus_object_manager_export (GDBusObjectManager *manager, * Like g_dbus_object_manager_export() but appends a string of the * form <literal>_N</literal> (with N being a natural number) to * @object<!-- -->'s object path if an object with the given path - * already exists. As such, the #GDBusObject:object-path property + * already exists. As such, the #GDBusObjectProxy:object-path property * may be modified. */ void diff --git a/src/gdbusobjectproxy.h b/src/gdbusobjectproxy.h index 7edf836..4d63a69 100644 --- a/src/gdbusobjectproxy.h +++ b/src/gdbusobjectproxy.h @@ -54,8 +54,6 @@ struct _GDBusObjectProxy /** * GDBusObjectProxyClass: * @parent_class: The parent class. - * @interface_proxy_added: Signal class handler for the #GDBusObjectProxy::interface-proxy-added signal. - * @interface_proxy_removed: Signal class handler for the #GDBusObjectProxy::interface-proxy-removed signal. * * Class structure for #GDBusObjectProxy. */ diff --git a/src/gdbusproxymanager.c b/src/gdbusproxymanager.c index e0cd26a..2c5b1e4 100644 --- a/src/gdbusproxymanager.c +++ b/src/gdbusproxymanager.c @@ -90,8 +90,8 @@ * * To avoid having the application connect to signals on the returned * #GDBusObjectProxy and #GDBusProxy objects, the - * #GDBusObjectProxy::interface-proxy-added, - * #GDBusObjectProxy::interface-proxy-removed, + * #GDBusObject::interface-added, + * #GDBusObject::interface-removed, * #GDBusProxy::g-properties-changed and * #GDBusProxy::g-signal signals * are also emitted on the #GDBusProxyManager instance managing these |