From 3d37b17e7854acff3c83f58ad3f7d6cbdd34c27b Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <gkiagia@tolabaki.gr>
Date: Tue, 29 Nov 2016 11:21:42 +0200
Subject: introspection: fix annotation warnings possibly caused by a g-i bug

g-i for some reason complains about (transfer none) *not* being
applied to an array, container or object in these instances,
although we actually apply it to arrays. Since (transfer none) is
implied for const arrays though, we can remove it and apparently the
generated .gir file is correct! \o/
---
 telepathy-glib/client-factory.c | 12 ++++++------
 telepathy-glib/contact.c        |  4 ++--
 telepathy-glib/proxy.c          |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/telepathy-glib/client-factory.c b/telepathy-glib/client-factory.c
index d1826244f..bde9f039e 100644
--- a/telepathy-glib/client-factory.c
+++ b/telepathy-glib/client-factory.c
@@ -766,7 +766,7 @@ tp_client_factory_dup_account_features (TpClientFactory *self,
 /**
  * tp_client_factory_add_account_features:
  * @self: a #TpClientFactory object
- * @features: (transfer none) (array zero-terminated=1) (allow-none): an array
+ * @features: (array zero-terminated=1) (allow-none): an array
  *  of desired features, ending with 0; %NULL is equivalent to an array
  *  containing only 0
  *
@@ -907,7 +907,7 @@ tp_client_factory_dup_connection_features (TpClientFactory *self,
 /**
  * tp_client_factory_add_connection_features:
  * @self: a #TpClientFactory object
- * @features: (transfer none) (array zero-terminated=1) (allow-none): an array
+ * @features: (array zero-terminated=1) (allow-none): an array
  *  of desired features, ending with 0; %NULL is equivalent to an array
  *  containing only 0
  *
@@ -1053,7 +1053,7 @@ tp_client_factory_dup_channel_features (TpClientFactory *self,
 /**
  * tp_client_factory_add_channel_features:
  * @self: a #TpClientFactory object
- * @features: (transfer none) (array zero-terminated=1) (allow-none): an array
+ * @features: (array zero-terminated=1) (allow-none): an array
  *  of desired features, ending with 0; %NULL is equivalent to an array
  *  containing only 0
  *
@@ -1358,7 +1358,7 @@ tp_client_factory_dup_contact_features (TpClientFactory *self,
 /**
  * tp_client_factory_add_contact_features:
  * @self: a #TpClientFactory object
- * @features: (transfer none) (array zero-terminated=1) (allow-none):
+ * @features: (array zero-terminated=1) (allow-none):
  *  an array of desired features
  *
  * Add @features to the desired features to be prepared on #TpContact
@@ -1607,7 +1607,7 @@ tp_client_factory_dup_protocol_features (TpClientFactory *self,
 /**
  * tp_client_factory_add_protocol_features:
  * @self: a #TpClientFactory object
- * @features: (transfer none) (array zero-terminated=1) (allow-none): an array
+ * @features: (array zero-terminated=1) (allow-none): an array
  *  of desired features, ending with 0; %NULL is equivalent to an array
  *  containing only 0
  *
@@ -1736,7 +1736,7 @@ tp_client_factory_dup_tls_certificate_features (TpClientFactory *self,
 /**
  * tp_client_factory_add_tls_certificate_features:
  * @self: a #TpClientFactory object
- * @features: (transfer none) (array zero-terminated=1) (allow-none): an array
+ * @features: (array zero-terminated=1) (allow-none): an array
  *  of desired features, ending with 0; %NULL is equivalent to an array
  *  containing only 0
  *
diff --git a/telepathy-glib/contact.c b/telepathy-glib/contact.c
index 77cbaf7eb..ca795a5c5 100644
--- a/telepathy-glib/contact.c
+++ b/telepathy-glib/contact.c
@@ -3331,7 +3331,7 @@ got_contact_by_id_cb (TpConnection *self,
  * @id: A strings representing the desired contact by its
  *  identifier in the IM protocol (an XMPP JID, SIP URI, MSN Passport,
  *  AOL screen-name etc.)
- * @features: (transfer none) (array zero-terminated=1) (allow-none) (element-type GLib.Quark):
+ * @features: (array zero-terminated=1) (allow-none):
  *  An array of features that must be ready for
  * @callback: A user callback to call when the contact is ready
  * @user_data: Data to pass to the callback
@@ -3460,7 +3460,7 @@ got_contact_attributes_cb (TpConnection *self,
  * @n_contacts: The number of contacts in @contacts (must be at least 1)
  * @contacts: (array length=n_contacts): An array of #TpContact objects
  *  associated with @self
- * @features: (transfer none) (array zero-terminated=1) (allow-none) (element-type GLib.Quark):
+ * @features: (array zero-terminated=1) (allow-none):
  *  An array of features that must be ready for
  * @callback: A user callback to call when the contacts are ready
  * @user_data: Data to pass to the callback
diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c
index da1ca5b0a..7c429bd9f 100644
--- a/telepathy-glib/proxy.c
+++ b/telepathy-glib/proxy.c
@@ -1467,7 +1467,7 @@ prepare_depends (TpProxy *self,
 /**
  * tp_proxy_prepare_async:
  * @self: an instance of a #TpProxy subclass
- * @features: (transfer none) (array zero-terminated=1) (allow-none): an array
+ * @features: (array zero-terminated=1) (allow-none): an array
  *  of desired features, ending with 0; %NULL is equivalent to an array
  *  containing only 0
  * @callback: if not %NULL, called exactly once, when the features have all
-- 
cgit v1.2.1