From 3ba81a94b7d7351f8288cb78d3be23088b10004c Mon Sep 17 00:00:00 2001 From: Morten Mjelva Date: Thu, 29 Apr 2010 14:14:47 +0200 Subject: [PATCH] Added element-type and transfer annotations to garray arguments Skipped tp_g_value_slice_* functions in dbus.c --- telepathy-glib/account.c | 4 ++-- telepathy-glib/channel.c | 16 ++++++++-------- telepathy-glib/connection-handles.c | 4 ++-- telepathy-glib/dbus.c | 10 +++++----- telepathy-glib/intset.c | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c index 76b49b9..5b9542e 100644 --- a/telepathy-glib/account.c +++ b/telepathy-glib/account.c @@ -2372,8 +2372,8 @@ tp_account_get_avatar_async (TpAccount *account, * * Finishes an async get operation of @account's avatar. * - * Returns: a #GArray of #guchar containing the bytes of the account's avatar, - * or %NULL on failure + * Returns: (element-type uint8): a #GArray of #guchar + * containing the bytes of the account's avatar, or %NULL on failure * * Since: 0.9.0 */ diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c index 8748678..642cb74 100644 --- a/telepathy-glib/channel.c +++ b/telepathy-glib/channel.c @@ -1627,14 +1627,14 @@ tp_channel_class_init (TpChannelClass *klass) /** * TpChannel::group-members-changed-detailed: * @self: a channel - * @added: (type GLib.Array): a #GArray of #guint containing the full - * members added - * @removed: (type GLib.Array): a #GArray of #guint containing the members - * (full, local-pending or remote-pending) removed - * @local_pending: (type GLib.Array): a #GArray of #guint containing the - * local-pending members added - * @remote_pending: (type GLib.Array): a #GArray of #guint containing the - * remote-pending members added + * @added: (type GLib.Array) (element-type uint): a #GArray of #guint + * containing the full members added + * @removed: (type GLib.Array) (element-type uint): a #GArray of #guint + * containing the members (full, local-pending or remote-pending) removed + * @local_pending: (type GLib.Array) (element-type uint): a #GArray of + * #guint containing the local-pending members added + * @remote_pending: (type GLib.Array) (element-type uint): a #GArray of + * #guint containing the remote-pending members added * @details: (type GLib.HashTable): (element-type utf8 GObject.Value): * a #GHashTable mapping (gchar *) to #GValue containing details * about the change, as described in the specification of the diff --git a/telepathy-glib/connection-handles.c b/telepathy-glib/connection-handles.c index 5533ae9..6fe31f8 100644 --- a/telepathy-glib/connection-handles.c +++ b/telepathy-glib/connection-handles.c @@ -535,8 +535,8 @@ request_handles_context_free (gpointer p) * tp_connection_request_handles() * @n_handles: the number of IDs that were passed to * tp_connection_request_handles() on success, or 0 on failure - * @handles: the @n_handles handles corresponding to @ids, in the same order, - * or %NULL on failure + * @handles: (array length=n_handles): the @n_handles handles corresponding + * to @ids, in the same order, or %NULL on failure * @ids: a copy of the array of @n_handles IDs that was passed to * tp_connection_request_handles() on success, or %NULL on failure * @error: %NULL on success, or an error on failure diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c index de46048..8653415 100644 --- a/telepathy-glib/dbus.c +++ b/telepathy-glib/dbus.c @@ -576,7 +576,7 @@ tp_dbus_check_valid_object_path (const gchar *path, GError **error) } /** - * tp_g_value_slice_new_bytes: + * tp_g_value_slice_new_bytes: (skip) * @length: number of bytes to copy * @bytes: location of an array of bytes to be copied (this may be %NULL * if and only if length is 0) @@ -607,7 +607,7 @@ tp_g_value_slice_new_bytes (guint length, } /** - * tp_g_value_slice_new_take_bytes: + * tp_g_value_slice_new_take_bytes: (skip) * @bytes: a non-NULL #GArray of guchar, ownership of which will be taken by * the #GValue * @@ -629,7 +629,7 @@ tp_g_value_slice_new_take_bytes (GArray *bytes) } /** - * tp_g_value_slice_new_object_path: + * tp_g_value_slice_new_object_path: (skip) * @path: a valid D-Bus object path which will be copied * * Slice-allocate a #GValue containing an object path, using @@ -649,7 +649,7 @@ tp_g_value_slice_new_object_path (const gchar *path) } /** - * tp_g_value_slice_new_static_object_path: + * tp_g_value_slice_new_static_object_path: (skip) * @path: a valid D-Bus object path which must remain valid forever * * Slice-allocate a #GValue containing an object path, using @@ -669,7 +669,7 @@ tp_g_value_slice_new_static_object_path (const gchar *path) } /** - * tp_g_value_slice_new_take_object_path: + * tp_g_value_slice_new_take_object_path: (skip) * @path: a valid D-Bus object path which will be freed with g_free() by the * returned #GValue (the caller must own it before calling this function, but * no longer owns it after this function returns) diff --git a/telepathy-glib/intset.c b/telepathy-glib/intset.c index d4bad04..a1abe13 100644 --- a/telepathy-glib/intset.c +++ b/telepathy-glib/intset.c @@ -358,7 +358,7 @@ addint (guint i, gpointer data) * * * - * Returns: a GArray of guint (which must be freed by the caller) containing + * Returns: (element-type uint): a GArray of guint (which must be freed by the caller) containing * the same integers as @set. */ GArray * @@ -378,7 +378,7 @@ tp_intset_to_array (const TpIntSet *set) /** * tp_intset_from_array: - * @array: An array of guint + * @array: (element-type uint): An array of guint * * * -- 1.7.0.4