From 06116002040ed195d7626eaa1d3fd2ee64399f8d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 31 May 2011 16:17:34 +0100 Subject: [PATCH 08/14] Add DBUS_TYPE_CONNECTION, DBUS_TYPE_MESSAGE to the docs, and document them better --- dbus/dbus-glib.c | 15 +++++++++++---- doc/reference/dbus-glib-sections.txt | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dbus/dbus-glib.c b/dbus/dbus-glib.c index 83c3285..6b4760f 100644 --- a/dbus/dbus-glib.c +++ b/dbus/dbus-glib.c @@ -227,8 +227,11 @@ dbus_g_error_get_name (GError *error) } /** - * dbus_connection_get_g_type: - * Get the GLib type ID for a #DBusConnection boxed type. + * DBUS_TYPE_CONNECTION: + * + * Expands to a function call returning a boxed #GType representing a + * #DBusConnection pointer from libdbus. Not to be confused with + * %DBUS_TYPE_G_CONNECTION, which you should usually use instead. * * Returns: the GLib type */ @@ -246,8 +249,12 @@ dbus_connection_get_g_type (void) } /** - * dbus_message_get_g_type: - * Get the GLib type ID for a #DBusMessage boxed type. + * DBUS_TYPE_MESSAGE: + * + * Expands to a function call returning a boxed #GType representing a + * #DBusMessage pointer from libdbus. Not to be confused with + * %DBUS_TYPE_G_MESSAGE, which you should usually use instead. + * * * Returns: the GLib type */ diff --git a/doc/reference/dbus-glib-sections.txt b/doc/reference/dbus-glib-sections.txt index 43721b7..d34cea1 100644 --- a/doc/reference/dbus-glib-sections.txt +++ b/doc/reference/dbus-glib-sections.txt @@ -113,9 +113,9 @@ dbus_set_g_error dbus_connection_setup_with_g_main dbus_connection_get_g_connection dbus_server_setup_with_g_main - DBUS_TYPE_CONNECTION DBUS_TYPE_MESSAGE + DBUS_TYPE_PENDING_CALL dbus_connection_get_g_type dbus_message_get_g_type -- 1.7.5.3