[telepathy-glib-0.20] telepathy-glib: Add some missing (element-type) introspection annotations

[Will Thompson]

Module: telepathy-glib
Branch: telepathy-glib-0.20
Commit: 8da3211ce74e143f59973b8f2f17295b7165b22c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=8da3211ce74e143f59973b8f2f17295b7165b22c

Author: Philip Withnall <philip at tecnocode.co.uk>
Date:   Sat Dec 29 11:41:50 2012 +0000

Add some missing (element-type) introspection annotations

This fixes compilation with --enable-introspection when introspection
warnings are treated as errors.

Signed-off-by: Robert McQueen <robert.mcqueen at collabora.co.uk>

https://bugs.freedesktop.org/show_bug.cgi?id=58851

---

 telepathy-glib/capabilities.c           |    4 ++--
 telepathy-glib/client-channel-factory.c |    2 +-
 telepathy-glib/dbus.c                   |    3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/telepathy-glib/capabilities.c b/telepathy-glib/capabilities.c
index ae1d34f..4ddf368 100644
--- a/telepathy-glib/capabilities.c
+++ b/telepathy-glib/capabilities.c
@@ -84,8 +84,8 @@ struct _TpCapabilitiesPrivate {
  *
  * <!-- -->
  *
- * Returns: (transfer none): the same #GPtrArray as the
- * #TpCapabilities:channel-classes property
+ * Returns: (transfer none) (element-type GHashTable): the same #GPtrArray as
+ * the #TpCapabilities:channel-classes property
  *
  * Since: 0.11.3
  */
diff --git a/telepathy-glib/client-channel-factory.c b/telepathy-glib/client-channel-factory.c
index c5d3cf4..3dbf7af 100644
--- a/telepathy-glib/client-channel-factory.c
+++ b/telepathy-glib/client-channel-factory.c
@@ -139,7 +139,7 @@ tp_client_channel_factory_create_channel (TpClientChannelFactory *self,
  * it expected an object instance as its first parameter, but the type of the
  * parameter was the type of the interface vtable.
  *
- * Returns: (transfer full): a newly allocated #GArray
+ * Returns: (transfer full) (element-type GQuark): a newly allocated #GArray
  *
  * Since: 0.13.3
  */
diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
index 04ba84b..ba28e29 100644
--- a/telepathy-glib/dbus.c
+++ b/telepathy-glib/dbus.c
@@ -881,7 +881,8 @@ tp_asv_set_boolean (GHashTable *asv,
  * g_boxed_copy (DBUS_TYPE_G_UCHAR_ARRAY, ...) if you need to keep
  * it for longer.
  *
- * Returns: (transfer none) (allow-none): the string value of @key, or %NULL
+ * Returns: (transfer none) (allow-none) (element-type guint8): the string value
+ * of @key, or %NULL
  * Since: 0.7.9
  */
 const GArray *