From ea742e88e30fc398b8f86cc017161e6dcbb61e08 Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Sat, 16 Apr 2011 14:42:21 -0400 Subject: [PATCH] GDBus: Add some gobject-introspection annotations for new code Signed-off-by: David Zeuthen --- gio/gdbusinterfaceskeleton.c | 2 +- gio/gdbusobject.c | 14 +++++++------- gio/gdbusobjectmanager.c | 6 ++++-- gio/gdbusobjectmanagerclient.c | 24 ++++++++++++++---------- gio/gdbusobjectmanagerserver.c | 4 ++-- gio/gdbusobjectproxy.c | 3 ++- 6 files changed, 30 insertions(+), 23 deletions(-) diff --git a/gio/gdbusinterfaceskeleton.c b/gio/gdbusinterfaceskeleton.c index 811fe2b63..89616ae94 100644 --- a/gio/gdbusinterfaceskeleton.c +++ b/gio/gdbusinterfaceskeleton.c @@ -294,7 +294,7 @@ g_dbus_interface_skeleton_get_info (GDBusInterfaceSkeleton *interface_) } /** - * g_dbus_interface_skeleton_get_vtable: + * g_dbus_interface_skeleton_get_vtable: (skip) * @interface_: A #GDBusInterfaceSkeleton. * * Gets the interface vtable for the D-Bus interface implemented by diff --git a/gio/gdbusobject.c b/gio/gdbusobject.c index d3ffd6be6..c982fe0f3 100644 --- a/gio/gdbusobject.c +++ b/gio/gdbusobject.c @@ -133,8 +133,8 @@ g_dbus_object_get_interfaces (GDBusObject *object) * Gets the D-Bus interface with name @interface_name associated with * @object, if any. * - * Returns: %NULL if not found, otherwise a #GDBusInterface that must - * be freed with g_object_unref(). + * Returns: (transfer full): %NULL if not found, otherwise a + * #GDBusInterface that must be freed with g_object_unref(). * * Since: 2.30 */ @@ -160,9 +160,9 @@ g_dbus_object_get_interface (GDBusObject *object, * This function is intended to only be used in type * implementations. * - * Returns: A #GDBusInterface implementing @type or %NULL if - * not found. Do not free the returned object, it is owned by - * @object. + * Returns: (transfer none): A #GDBusInterface implementing @type or + * %NULL if not found. Do not free the returned object, it is owned + * by @object. * * Since: 2.30 */ @@ -188,8 +188,8 @@ g_dbus_object_peek_with_typecheck (GDBusObject *object, * This function is intended to only be used in type * implementations. * - * Returns: A #GDBusInterface implementing @type or %NULL if - * not found. Free with g_object_unref(). + * Returns: (transfer full): A #GDBusInterface implementing @type or + * %NULL if not found. Free with g_object_unref(). * * Since: 2.30 */ diff --git a/gio/gdbusobjectmanager.c b/gio/gdbusobjectmanager.c index 835836c3a..7e0a15769 100644 --- a/gio/gdbusobjectmanager.c +++ b/gio/gdbusobjectmanager.c @@ -188,7 +188,8 @@ g_dbus_object_manager_get_objects (GDBusObjectManager *manager) * * Gets the #GDBusObjectProxy at @object_path, if any. * - * Returns: A #GDBusObject or %NULL. Free with g_object_unref(). + * Returns: (transfer full): A #GDBusObject or %NULL. Free with + * g_object_unref(). * * Since: 2.30 */ @@ -210,7 +211,8 @@ g_dbus_object_manager_get_object (GDBusObjectManager *manager, * Gets the interface proxy for @interface_name at @object_path, if * any. * - * Returns: A #GDBusInterface instance or %NULL. Free with g_object_unref(). + * Returns: (transfer full): A #GDBusInterface instance or %NULL. Free + * with g_object_unref(). * * Since: 2.30 */ diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c index 378788cbf..74062e69c 100644 --- a/gio/gdbusobjectmanagerclient.c +++ b/gio/gdbusobjectmanagerclient.c @@ -568,8 +568,9 @@ g_dbus_object_manager_client_init (GDBusObjectManagerClient *manager) * blocked until a reply is received. See g_dbus_object_manager_client_new() * for the asynchronous version. * - * Returns: A #GDBusObjectManagerClient object or %NULL if @error is - * set. Free with g_object_unref(). + * Returns: (transfer full) (type GDBusObjectManagerClient): A + * #GDBusObjectManagerClient object or %NULL if @error is set. Free + * with g_object_unref(). * * Since: 2.30 */ @@ -667,8 +668,9 @@ g_dbus_object_manager_client_new (GDBusConnection *connection, * * Finishes an operation started with g_dbus_object_manager_client_new(). * - * Returns: A #GDBusObjectManagerClient object or %NULL if @error is - * set. Free with g_object_unref(). + * Returns: (transfer full) (type GDBusObjectManagerClient): A + * #GDBusObjectManagerClient object or %NULL if @error is set. Free + * with g_object_unref(). * * Since: 2.30 */ @@ -713,8 +715,9 @@ g_dbus_object_manager_client_new_finish (GAsyncResult *res, * blocked until a reply is received. See g_dbus_object_manager_client_new_for_bus() * for the asynchronous version. * - * Returns: A #GDBusObjectManagerClient object or %NULL if @error is - * set. Free with g_object_unref(). + * Returns: (transfer full) (type GDBusObjectManagerClient): A + * #GDBusObjectManagerClient object or %NULL if @error is set. Free + * with g_object_unref(). * * Since: 2.30 */ @@ -811,8 +814,9 @@ g_dbus_object_manager_client_new_for_bus (GBusType bus_typ * * Finishes an operation started with g_dbus_object_manager_client_new_for_bus(). * - * Returns: A #GDBusObjectManagerClient object or %NULL if @error is - * set. Free with g_object_unref(). + * Returns: (transfer full) (type GDBusObjectManagerClient): A + * #GDBusObjectManagerClient object or %NULL if @error is set. Free + * with g_object_unref(). * * Since: 2.30 */ @@ -845,8 +849,8 @@ g_dbus_object_manager_client_new_for_bus_finish (GAsyncResult *res, * * Gets the #GDBusConnection used by @manager. * - * Returns: A #GDBusConnection object. Do not free, the object belongs - * to @manager. + * Returns: (transfer none): A #GDBusConnection object. Do not free, + * the object belongs to @manager. * * Since: 2.30 */ diff --git a/gio/gdbusobjectmanagerserver.c b/gio/gdbusobjectmanagerserver.c index 7c860a46b..c31b2ba89 100644 --- a/gio/gdbusobjectmanagerserver.c +++ b/gio/gdbusobjectmanagerserver.c @@ -255,8 +255,8 @@ g_dbus_object_manager_server_new (GDBusConnection *connection, * * Gets the #GDBusConnection used by @manager. * - * Returns: A #GDBusConnection object. Do not free, the object belongs - * to @manager. + * Returns: (transfer none): A #GDBusConnection object. Do not free, + * the object belongs to @manager. * * Since: 2.30 */ diff --git a/gio/gdbusobjectproxy.c b/gio/gdbusobjectproxy.c index 263d06ce2..39d31266c 100644 --- a/gio/gdbusobjectproxy.c +++ b/gio/gdbusobjectproxy.c @@ -181,7 +181,8 @@ g_dbus_object_proxy_get_object_path (GDBusObject *object) * * Gets the connection that @proxy is for. * - * Returns: A #GDBusConnection. Do not free, the object is owned by @proxy. + * Returns: (transfer none): A #GDBusConnection. Do not free, the + * object is owned by @proxy. * * Since: 2.30 */