summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Withnall <philip@tecnocode.co.uk>2012-12-29 11:41:50 +0000
committerWill Thompson <will.thompson@collabora.co.uk>2012-12-29 12:16:19 +0000
commitfe88f67b789b7702d15866b80ebb989a28b6f7e6 (patch)
tree58af990614b3cfe111f4918ef566300155ed1ce1
parent4acc51d5b848359211bb8a00f0daa8e0bc44eb65 (diff)
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@collabora.co.uk> https://bugs.freedesktop.org/show_bug.cgi?id=58851
-rw-r--r--telepathy-glib/capabilities.c4
-rw-r--r--telepathy-glib/client-channel-factory.c2
-rw-r--r--telepathy-glib/dbus.c3
3 files changed, 5 insertions, 4 deletions
diff --git a/telepathy-glib/capabilities.c b/telepathy-glib/capabilities.c
index ae1d34f9f..4ddf368f3 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 c5d3cf46a..3dbf7afb4 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 04ba84bd4..ba28e2914 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 *