summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-30 13:10:33 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-30 13:10:33 +0000
commitc46867e834e4e1da90dbd3bbfbe29325f751d1c1 (patch)
tree1276816915a07b9326de3c30038ad1e891aed985
parent94674279dabfd8ec01c2f7a16ace915974bf8a9c (diff)
Introspect TpBaseConnectionManager and TpBaseProtocol
This requires filling in a couple of missing annotations, so do that.
-rw-r--r--telepathy-glib/base-protocol.c5
-rw-r--r--telepathy-glib/introspection.am2
2 files changed, 5 insertions, 2 deletions
diff --git a/telepathy-glib/base-protocol.c b/telepathy-glib/base-protocol.c
index 6909aedac..2cb3f4e97 100644
--- a/telepathy-glib/base-protocol.c
+++ b/telepathy-glib/base-protocol.c
@@ -946,7 +946,8 @@ tp_base_protocol_get_name (TpBaseProtocol *self)
* Note that in particular, tp_asv_set_string() and similar functions should
* not be used with this hash table.
*
- * Returns: a hash table mapping (gchar *) fully-qualified property names to
+ * Returns: (transfer container) (element-type utf8 GObject.Value): a hash
+ * table mapping (gchar *) fully-qualified property names to
* GValues, which must be freed by the caller (at which point its
* contents will also be freed).
*
@@ -1974,7 +1975,7 @@ except:
* filled in where available, and parameters' types converted to the #GType
* specified by #TpCMParamSpec.gtype.
*
- * Returns: a new connection, or %NULL on error
+ * Returns: (transfer full): a new connection, or %NULL on error
*
* Since: 0.11.11
*/
diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am
index ad23841f8..eb9001c1c 100644
--- a/telepathy-glib/introspection.am
+++ b/telepathy-glib/introspection.am
@@ -19,6 +19,8 @@ TelepathyGLib_0_12_gir_FILES = \
$(srcdir)/account-manager.c $(srcdir)/account-manager.h \
$(srcdir)/automatic-client-factory.c $(srcdir)/automatic-client-factory.h \
$(srcdir)/automatic-proxy-factory.c $(srcdir)/automatic-proxy-factory.h \
+ $(srcdir)/base-connection-manager.c $(srcdir)/base-connection-manager.h \
+ $(srcdir)/base-protocol.c $(srcdir)/base-protocol.h \
$(srcdir)/basic-proxy-factory.c $(srcdir)/basic-proxy-factory.h \
$(srcdir)/client-channel-factory.c $(srcdir)/client-channel-factory.h \
$(srcdir)/connection.c $(srcdir)/connection.h \