From 280936e91e52da9ae100c3b4627a7e5525e571dc Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 22 Feb 2012 18:39:32 +0000 Subject: [PATCH 6/6] Annotate GStrv as (array zero-terminated=1) for introspectability (type GObject.Strv) isn't understood. This affects tp_account_update_parameters_finish, tp_connection_manager_dup_protocol_names, tp_connection_manager_protocol_dup_param_names and tp_protocol_dup_param_names. --- telepathy-glib/account.c | 2 +- telepathy-glib/connection-manager.c | 4 ++-- telepathy-glib/protocol.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c index f012fe9..9bbfa67 100644 --- a/telepathy-glib/account.c +++ b/telepathy-glib/account.c @@ -2669,7 +2669,7 @@ tp_account_update_parameters_async (TpAccount *account, * tp_account_update_parameters_finish: * @account: a #TpAccount * @result: a #GAsyncResult - * @reconnect_required: (out) (type GObject.Strv) (transfer full): a #GStrv to + * @reconnect_required: (out) (array zero-terminated=1) (transfer full): a #GStrv to * fill with properties that need a reconnect to take effect * @error: a #GError to fill * diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c index 9d20769..afe0a28 100644 --- a/telepathy-glib/connection-manager.c +++ b/telepathy-glib/connection-manager.c @@ -2055,7 +2055,7 @@ tp_connection_manager_get_info_source (TpConnectionManager *self) * The result is copied and must be freed by the caller, but it is not * necessarily still true after the main loop is re-entered. * - * Returns: (type GObject.Strv) (transfer full): a #GStrv of protocol names + * Returns: (array zero-terminated=1) (transfer full): a #GStrv of protocol names * Since: 0.7.26 */ gchar ** @@ -2255,7 +2255,7 @@ tp_connection_manager_protocol_can_register ( * * The result is copied and must be freed by the caller with g_strfreev(). * - * Returns: (type GObject.Strv) (transfer full): a #GStrv of protocol names + * Returns: (array zero-terminated=1) (transfer full): a #GStrv of protocol names * Since: 0.7.26 */ gchar ** diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c index 00b24c7..f65260b 100644 --- a/telepathy-glib/protocol.c +++ b/telepathy-glib/protocol.c @@ -924,7 +924,7 @@ tp_protocol_can_register (TpProtocol *self) * * The result is copied and must be freed by the caller with g_strfreev(). * - * Returns: (type GObject.Strv) (transfer full): a copy of + * Returns: (array zero-terminated=1) (transfer full): a copy of * #TpProtocol:param-names * * Since: 0.11.11 -- 1.7.9.1