Merge branch 'master' into next

Conflicts:
	telepathy-glib/base-connection-manager.c
	telepathy-glib/base-connection.c
	telepathy-glib/errors.c
	telepathy-glib/message.c
	telepathy-glib/presence-mixin.c
	telepathy-glib/properties-mixin.c

38 files changed, 310 insertions, 148 deletions

diff --git a/Android.mk b/Android.mk
index 4cab566bb..a9bc79ff6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,7 @@ LOCAL_PATH:= $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include ../telepathy-glib/telepathy-glib/codegen.am
+include $(LOCAL_PATH)/telepathy-glib/codegen.am
 
 TELEPATHY_GLIB_BUILT_SOURCES := \
 	telepathy-glib/telepathy-glib.pc \
diff --git a/configure.ac b/configure.ac
index 997c9f0c7..9fb838595 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,7 +214,7 @@ PKG_CHECK_MODULES(GLIB,
   [glib-2.0 >= 2.30.0, gobject-2.0 >= 2.30.0, gio-2.0 >= 2.30.0])
 
 AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30], [Ignore post 2.30 deprecations])
-AC_DEFINE([GLIB_VERSION_MAX_REQUIRED], [GLIB_VERSION_2_30], [Prevent post 2.30 APIs])
+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_30], [Prevent post 2.30 APIs])
 
 dnl Check for GIO-Unix
 PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0],
diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt
index ecbe6d385..c1e7e0e99 100644
--- a/docs/reference/telepathy-glib-sections.txt
+++ b/docs/reference/telepathy-glib-sections.txt
@@ -1132,9 +1132,6 @@ tp_svc_connection_interface_contact_list_return_from_unpublish
 tp_svc_connection_interface_contact_list_return_from_unsubscribe
 tp_svc_connection_interface_contact_list_unpublish_impl
 tp_svc_connection_interface_contact_list_unsubscribe_impl
-tp_svc_connection_interface_contact_list_download_impl
-tp_svc_connection_interface_contact_list_implement_download
-tp_svc_connection_interface_contact_list_return_from_download
 <SUBSECTION Standard>
 tp_svc_connection_interface_contact_blocking_get_type
 tp_svc_connection_interface_contact_list_get_type
@@ -1424,11 +1421,6 @@ TP_ARRAY_TYPE_PROPERTY_FLAGS_CHANGE_LIST
 TP_STRUCT_TYPE_PROPERTY_VALUE
 TP_ARRAY_TYPE_PROPERTY_VALUE_LIST
 <SUBSECTION>
-# Channel - Call
-TP_HASH_TYPE_CALL_MEMBER_MAP
-TP_ARRAY_TYPE_CALL_MEMBER_MAP_LIST
-TP_STRUCT_TYPE_CALL_STATE_REASON
-<SUBSECTION>
 # Channel - Media-related
 TP_ARRAY_TYPE_MEDIA_SESSION_HANDLER_INFO_LIST
 TP_STRUCT_TYPE_MEDIA_SESSION_HANDLER_INFO
@@ -1487,6 +1479,7 @@ TP_ARRAY_TYPE_TLS_CERTIFICATE_REJECTION_LIST
 <SUBSECTION>
 # Metadata
 TP_HASH_TYPE_METADATA
+<SUBSECTION>
 # Call
 TP_ARRAY_TYPE_CALL_MEMBER_MAP_LIST
 TP_ARRAY_TYPE_CANDIDATE_LIST
@@ -1615,7 +1608,6 @@ tp_type_dbus_struct_uuusa_7bsv_7du
 tp_type_dbus_struct_uuuuus
 tp_type_dbus_struct_uuuuuu
 tp_type_dbus_struct_uv
-tp_type_dbus_array_of_a_7buu_7d
 tp_type_dbus_array_ussuas
 tp_type_dbus_hash_su
 tp_type_dbus_struct_ussuas
@@ -2392,8 +2384,6 @@ TP_IFACE_CLIENT_OBSERVER
 TP_IFACE_QUARK_CLIENT_OBSERVER
 TP_IFACE_CLIENT_INTERFACE_REQUESTS
 TP_IFACE_QUARK_CLIENT_INTERFACE_REQUESTS
-TP_IFACE_CHANNEL_TYPE_CALL
-TP_IFACE_QUARK_CHANNEL_TYPE_CALL
 TP_IFACE_CALL_CONTENT
 TP_IFACE_QUARK_CALL_CONTENT
 TP_IFACE_CALL_CONTENT_INTERFACE_MEDIA
@@ -2743,12 +2733,6 @@ TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_GTALK_P2P
 TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_ICE_UDP
 TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_WLM_8_5
 TP_TOKEN_CHANNEL_INTERFACE_MEDIA_SIGNALLING_WLM_2009
-TP_TOKEN_CHANNEL_TYPE_CALL_AUDIO
-TP_TOKEN_CHANNEL_TYPE_CALL_GTALK_P2P
-TP_TOKEN_CHANNEL_TYPE_CALL_ICE
-TP_TOKEN_CHANNEL_TYPE_CALL_SHM
-TP_TOKEN_CHANNEL_TYPE_CALL_VIDEO
-TP_TOKEN_CHANNEL_TYPE_CALL_WLM_2009
 
 <SUBSECTION Private>
 tp_iface_quark_account
diff --git a/examples/client/python/Makefile.am b/examples/client/python/Makefile.am
index 94054551e..1d359797b 100644
--- a/examples/client/python/Makefile.am
+++ b/examples/client/python/Makefile.am
@@ -4,4 +4,6 @@ EXTRA_DIST = \
   inspect-cm.py \
   text-handler.py \
   file-transfer.py \
-  ft-handler.py
+  ft-handler.py \
+  stream-tubes.py/offerer.py \
+  stream-tubes.py/accepter.py
diff --git a/examples/client/python/stream-tubes.py/accepter.py b/examples/client/python/stream-tubes.py/accepter.py
new file mode 100755
index 000000000..0720ae7be
--- /dev/null
+++ b/examples/client/python/stream-tubes.py/accepter.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+
+import os
+
+from gi.repository import GObject, Gio
+from gi.repository import TelepathyGLib as Tp
+
+def tube_conn_closed(tube, error):
+    print "Tube connection has been closed", error.message
+
+def tube_accept_cb(tube, result, loop):
+    try:
+        tube_conn = tube.accept_finish(result)
+    except GObject.GError, e:
+        print "Failed to accept tube: %s" % e
+        sys.exit(1)
+
+    tube_conn.connect('closed', tube_conn_closed)
+
+    contact = tube_conn.get_contact();
+
+    print "Got IOStream to", contact.get_identifier()
+
+    conn = tube_conn.get_socket_connection();
+
+    # g_input_stream_read() can't be used from Python so we use the more
+    # binding friendly GDataInputStream
+    in_stream = Gio.DataInputStream (base_stream=conn.get_input_stream())
+    out_stream = conn.get_output_stream()
+
+    print "Sending: Ping"
+    out_stream.write("Ping\n", None)
+
+    buf, len = in_stream.read_line_utf8(None)
+    print "Received:", buf
+
+def tube_invalidated_cb(tube, domain, code, message, loop):
+    print "tube has been invalidated:", message
+    loop.quit()
+
+def handle_channels_cb(handler, account, connection, channels, requests,
+    user_action_time, context, loop):
+    for channel in channels:
+        if not isinstance(channel, Tp.StreamTubeChannel):
+            continue
+
+        print "Accepting tube"
+
+        channel.connect('invalidated', tube_invalidated_cb, loop)
+
+        channel.accept_async(tube_accept_cb, loop)
+
+    context.accept()
+
+if __name__ == '__main__':
+    Tp.debug_set_flags(os.getenv('EXAMPLE_DEBUG', ''))
+
+    loop = GObject.MainLoop()
+
+    account_manager = Tp.AccountManager.dup()
+    handler = Tp.SimpleHandler.new_with_am(account_manager, False, False,
+        'ExampleServiceHandler', False, handle_channels_cb, loop)
+
+    handler.add_handler_filter({
+        Tp.PROP_CHANNEL_CHANNEL_TYPE: Tp.IFACE_CHANNEL_TYPE_STREAM_TUBE,
+        Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE: int(Tp.HandleType.CONTACT),
+        Tp.PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE: "ExampleService",
+    })
+
+    handler.register()
+
+    print "Waiting for tube offer"
+    loop.run()
diff --git a/examples/client/python/stream-tubes.py/offerer.py b/examples/client/python/stream-tubes.py/offerer.py
new file mode 100755
index 000000000..1f4309d51
--- /dev/null
+++ b/examples/client/python/stream-tubes.py/offerer.py
@@ -0,0 +1,104 @@
+#!/usr/bin/env python
+
+import sys
+import os
+
+from gi.repository import GObject, Gio
+from gi.repository import TelepathyGLib as Tp
+
+def usage():
+    print "%s ACCOUNT CONTACT" % sys.argv[0]
+    print "ACCOUNT is a Telepathy account name, use 'mc-tool list' to list all your accounts"
+    print "CONTACT is a contact id such as badger@nyan.cat"
+
+    sys.exit(1)
+
+def offer_channel_cb(tube, result, loop):
+    try:
+        tube.offer_finish(result)
+        print "tube offered"
+
+    except GObject.GError, e:
+        print "Failed to offer tube: %s" % e
+        sys.exit(1)
+
+def tube_conn_closed(tube, error):
+    print "Tube connection has been closed", error.message
+
+def channel_close_cb(tube, result, loop):
+    try:
+        tube.close_finish(result)
+        print "tube channel closed"
+
+    except GObject.GError, e:
+        print "Failed to close tube channel: %s" % e
+        sys.exit(1)
+
+def tube_incoming_cb(tube, tube_conn, loop):
+    tube_conn.connect('closed', tube_conn_closed)
+
+    contact = tube_conn.get_contact();
+
+    print "Got IOStream from", contact.get_identifier()
+
+    conn = tube_conn.get_socket_connection();
+
+    # g_input_stream_read() can't be used from Python so we use the more
+    # binding friendly GDataInputStream
+    in_stream = Gio.DataInputStream (base_stream=conn.get_input_stream())
+    out_stream = conn.get_output_stream()
+
+    buf, len = in_stream.read_line_utf8(None)
+    print "Received:", buf
+
+    print "Sending: Pong"
+    out_stream.write("Pong\n", None)
+
+    tube.close_async(channel_close_cb, contact)
+
+def tube_invalidated_cb(tube, domain, code, message, loop):
+    print "tube has been invalidated:", message
+    loop.quit()
+
+def create_channel_cb(request, result, loop):
+    try:
+        (chan, context) = request.create_and_handle_channel_finish(result)
+
+        chan.connect('incoming', tube_incoming_cb, loop)
+        chan.connect('invalidated', tube_invalidated_cb, loop)
+
+        chan.offer_async({}, offer_channel_cb, loop)
+
+    except GObject.GError, e:
+        print "Failed to create channel: %s" % e
+        sys.exit(1)
+
+if __name__ == '__main__':
+    Tp.debug_set_flags(os.getenv('EXAMPLE_DEBUG', ''))
+
+    if len(sys.argv) != 3:
+        usage()
+
+    _, account_id, contact_id = sys.argv
+
+    account_manager = Tp.AccountManager.dup()
+    account = account_manager.ensure_account("%s%s" %
+        (Tp.ACCOUNT_OBJECT_PATH_BASE, account_id))
+
+    request_dict = {
+        Tp.PROP_CHANNEL_CHANNEL_TYPE:
+            Tp.IFACE_CHANNEL_TYPE_STREAM_TUBE,
+        Tp.PROP_CHANNEL_TARGET_HANDLE_TYPE:
+            int(Tp.HandleType.CONTACT),
+        Tp.PROP_CHANNEL_TARGET_ID:
+            contact_id,
+
+        Tp.PROP_CHANNEL_TYPE_STREAM_TUBE_SERVICE: "ExampleService",
+        }
+
+    request = Tp.AccountChannelRequest.new(account, request_dict, 0)
+
+    loop = GObject.MainLoop()
+    request.create_and_handle_channel_async(None, create_channel_cb, loop)
+
+    loop.run()
diff --git a/examples/client/stream-tubes/accepter.c b/examples/client/stream-tubes/accepter.c
index 8f6e580eb..41d7652bc 100644
--- a/examples/client/stream-tubes/accepter.c
+++ b/examples/client/stream-tubes/accepter.c
@@ -48,13 +48,14 @@ _tube_accepted (GObject *tube,
   out = g_io_stream_get_output_stream (G_IO_STREAM (conn));
 
   /* this bit is not a good example */
-  g_output_stream_write (out, "Ping", 4, NULL, &error);
+  g_debug ("Sending: Ping");
+  g_output_stream_write (out, "Ping\n", 5, NULL, &error);
   g_assert_no_error (error);
 
   g_input_stream_read (in, &buf, sizeof (buf), NULL, &error);
   g_assert_no_error (error);
 
-  g_debug ("Sent Ping got: %s", buf);
+  g_debug ("Received: %s", buf);
 
   g_object_unref (tube_conn);
   g_object_unref (tube);
diff --git a/examples/client/stream-tubes/offerer.c b/examples/client/stream-tubes/offerer.c
index 4ddd3f527..1eee6d09f 100644
--- a/examples/client/stream-tubes/offerer.c
+++ b/examples/client/stream-tubes/offerer.c
@@ -4,11 +4,20 @@
 static GMainLoop *loop = NULL;
 
 static void
-channel_closed_cb (TpChannel *channel,
-    const GError *error,
-    gpointer user_data,
-    GObject *weak_object)
+channel_closed_cb (GObject *object,
+    GAsyncResult *result,
+    gpointer user_data)
 {
+  TpChannel *channel = TP_CHANNEL (object);
+  GError *error = NULL;
+
+  if (!tp_channel_close_finish (channel, result, &error))
+    {
+      g_debug ("Failed to close tube channel: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
   g_debug ("Tube channel closed");
 }
 
@@ -46,16 +55,15 @@ _incoming_iostream (TpStreamTubeChannel *tube,
   out = g_io_stream_get_output_stream (G_IO_STREAM (conn));
 
   /* this bit is not a good example */
-  g_output_stream_write (out, "Pong", 4, NULL, &error);
-  g_assert_no_error (error);
-
   g_input_stream_read (in, &buf, sizeof (buf), NULL, &error);
   g_assert_no_error (error);
+  g_debug ("Received: %s", buf);
 
-  g_debug ("Send Pong got: %s", buf);
+  g_debug ("Sending: Pong");
+  g_output_stream_write (out, "Pong\n", 5, NULL, &error);
+  g_assert_no_error (error);
 
-  tp_cli_channel_call_close (TP_CHANNEL (tube), -1, channel_closed_cb,
-      NULL, NULL, NULL);
+  tp_channel_close_async (TP_CHANNEL (tube), channel_closed_cb, NULL);
 
   g_object_unref (tube);
 }
diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 18d773bca..fbd12331c 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -1724,7 +1724,7 @@ tp_account_class_init (TpAccountClass *klass)
           G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 
   /**
-   * TpAccount:nickname
+   * TpAccount:nickname:
    *
    * The nickname that should be set for the user on this account.
    *
@@ -1827,7 +1827,7 @@ tp_account_class_init (TpAccountClass *klass)
           G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 
   /**
-   * TpAccount:normalized-name
+   * TpAccount:normalized-name:
    *
    * The normalized form of the user's own unique identifier on this
    * protocol. For example, on XMPP accounts this is the user's JID; on
@@ -1926,7 +1926,7 @@ tp_account_class_init (TpAccountClass *klass)
         G_PARAM_STATIC_STRINGS | G_PARAM_READABLE));
 
   /**
-   * TpAccount:storage-restrictions
+   * TpAccount:storage-restrictions:
    *
    * The storage restrictions for this account.
    *
diff --git a/telepathy-glib/base-call-channel.c b/telepathy-glib/base-call-channel.c
index 8eeede71f..b4172d48f 100644
--- a/telepathy-glib/base-call-channel.c
+++ b/telepathy-glib/base-call-channel.c
@@ -522,7 +522,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallChannel:initial-audio-name
+   * TpBaseCallChannel:initial-audio-name:
    *
    * Name to use to create the audio #TpBaseCallContent if
    * #TpBaseCallChannel:initial-audio is set to %TRUE.
@@ -537,7 +537,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallChannel:initial-video-name
+   * TpBaseCallChannel:initial-video-name:
    *
    * Name to use to create the video #TpBaseCallContent if
    * #TpBaseCallChannel:initial-video is set to %TRUE.
@@ -552,7 +552,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallChannel:initial-transport
+   * TpBaseCallChannel:initial-transport:
    *
    * If set to %TRUE on a requested channel, this indicates the transport that
    * should be used for this call.
@@ -567,7 +567,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallChannel:mutable-contents
+   * TpBaseCallChannel:mutable-contents:
    *
    * Indicate to clients whether or not they can add/remove contents.
    *
@@ -581,7 +581,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallChannel:contents
+   * TpBaseCallChannel:contents:
    *
    * #GPtrArray of object-paths of the #TpBaseCallContent objects.
    *
@@ -595,7 +595,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallChannel:hardware-streaming
+   * TpBaseCallChannel:hardware-streaming:
    *
    * Indicate to clients whether or not this Connection Manager has hardware
    * streaming.
@@ -610,7 +610,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallChannel:call-state
+   * TpBaseCallChannel:call-state:
    *
    * The state of this call.
    *
@@ -623,7 +623,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
   g_object_class_install_property (object_class, PROP_CALL_STATE, param_spec);
 
   /**
-   * TpBaseCallChannel:call-flags
+   * TpBaseCallChannel:call-flags:
    *
    * The flags of this call.
    *
@@ -637,7 +637,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallChannel:call-state-reason
+   * TpBaseCallChannel:call-state-reason:
    *
    * The reason for last call state change.
    *
@@ -651,7 +651,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallChannel:call-state-details
+   * TpBaseCallChannel:call-state-details:
    *
    * Details on the call state.
    *
@@ -665,7 +665,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallChannel:call-members
+   * TpBaseCallChannel:call-members:
    *
    * #GHashTable mapping #TpHandle of each call member to their
    * #TpCallMemberFlags.
@@ -680,7 +680,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallChannel:member-identifiers
+   * TpBaseCallChannel:member-identifiers:
    *
    * #GHashTable mapping #TpHandle of each call member to their identifiers.
    *
@@ -695,7 +695,7 @@ tp_base_call_channel_class_init (TpBaseCallChannelClass *klass)
 
 
   /**
-   * TpBaseCallChannel:initial-tones
+   * TpBaseCallChannel:initial-tones:
    *
    * DTMF Tones to be played on the channel created.
    *
@@ -1208,7 +1208,7 @@ tp_base_call_channel_get_call_members (TpBaseCallChannel *self)
  * @self: a #TpBaseCallChannel
  *
  * Must be called when the remote contact accepted the call.
- * #TpBaseCallChannel:state must be either %TP_CALL_STATE_INITIALISED or
+ * #TpBaseCallChannel:call-state must be either %TP_CALL_STATE_INITIALISED or
  * %TP_CALL_STATE_INITIALISING and will then change to %TP_CALL_STATE_ACCEPTED.
  *
  * Must be used only for outgoing calls.
diff --git a/telepathy-glib/base-call-content.c b/telepathy-glib/base-call-content.c
index ee16e492c..4bb32ef8a 100644
--- a/telepathy-glib/base-call-content.c
+++ b/telepathy-glib/base-call-content.c
@@ -514,7 +514,7 @@ tp_base_call_content_class_init (TpBaseCallContentClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallContent:currently-sending-tones
+   * TpBaseCallContent:currently-sending-tones:
    *
    * If this content is currently sending tones or not
    *
@@ -529,7 +529,7 @@ tp_base_call_content_class_init (TpBaseCallContentClass *klass)
       param_spec);
 
   /**
-   * TpBaseCallContent:deferred-tones
+   * TpBaseCallContent:deferred-tones:
    *
    * Tones that are waiting for the user action to play.
    *
diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
index b1cd29292..5d6cb3863 100644
--- a/telepathy-glib/base-client.c
+++ b/telepathy-glib/base-client.c
@@ -161,7 +161,7 @@
  */
 
 /**
- * TpBaseClientDelegatedChannelsCb
+ * TpBaseClientDelegatedChannelsCb:
  * @client: a #TpBaseClient instance
  * @channels: (element-type TelepathyGLib.Channel): a #GPtrArray of #TpChannel
  * @user_data: arbitrary user-supplied data passed to
@@ -2601,7 +2601,7 @@ tp_base_client_get_object_path (TpBaseClient *self)
 }
 
 /**
- * tp_base_client_get_name: (skip)
+ * tp_base_client_get_name:
  * @self: a #TpBaseClient
  *
  * Return the #TpBaseClient:name construct-only property, which is used as
@@ -2618,7 +2618,7 @@ tp_base_client_get_name (TpBaseClient *self)
 }
 
 /**
- * tp_base_client_get_uniquify_name: (skip)
+ * tp_base_client_get_uniquify_name:
  * @self: a #TpBaseClient
  *
  * Return the #TpBaseClient:uniquify-name construct-only property; if this
@@ -2636,7 +2636,7 @@ tp_base_client_get_uniquify_name (TpBaseClient *self)
 }
 
 /**
- * tp_base_client_get_dbus_daemon: (skip)
+ * tp_base_client_get_dbus_daemon:
  * @self: a #TpBaseClient
  *
  * Return the #TpBaseClient:dbus-daemon construct-only property, which
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index b366cb20e..79ae7ccc8 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -144,8 +144,8 @@
  *  value; so if you're doing a sub-subclass of TpBaseConnection, you should use
  *  tp_base_connection_add_interfaces().
  * @create_channel_managers: Create an array of channel managers for this
- *  Connection. This must be set by subclasses to a non-%NULL value.
- *  Since: 0.7.15
+ *  Connection. This must be set by subclasses to a non-%NULL
+ *  value. Since: 0.7.15
  *
  * The class of a #TpBaseConnection. Many members are virtual methods etc.
  * to be filled in in the subclass' class_init function.
diff --git a/telepathy-glib/base-contact-list.c b/telepathy-glib/base-contact-list.c
index e9e064951..a339aff61 100644
--- a/telepathy-glib/base-contact-list.c
+++ b/telepathy-glib/base-contact-list.c
@@ -2024,7 +2024,7 @@ tp_base_contact_list_download_async (TpBaseContactList *self,
  * tp_base_contact_list_download_async().
  *
  * This is a virtual method which may be implemented using
- * #TpContactListClass.download_finish. If the @result
+ * #TpBaseContactListClass.download_finish. If the @result
  * will be a #GSimpleAsyncResult, the default implementation may be used.
  *
  * Returns: %TRUE on success or %FALSE on error
diff --git a/telepathy-glib/base-media-call-content.c b/telepathy-glib/base-media-call-content.c
index 47fc6d2f8..95d855048 100644
--- a/telepathy-glib/base-media-call-content.c
+++ b/telepathy-glib/base-media-call-content.c
@@ -438,7 +438,7 @@ tp_base_media_call_content_class_init (TpBaseMediaCallContentClass *klass)
       "deferred-tones");
 
   /**
-   * TpBaseMediaCallContent::local-media-description-updated
+   * TpBaseMediaCallContent::local-media-description-updated:
    * @self: the #TpCallChannel
    * @contact: the remote contact
    * @properties: the new media description properties asv
diff --git a/telepathy-glib/base-media-call-stream.c b/telepathy-glib/base-media-call-stream.c
index 5df072777..20dd03d84 100644
--- a/telepathy-glib/base-media-call-stream.c
+++ b/telepathy-glib/base-media-call-stream.c
@@ -59,10 +59,10 @@
  * @request_receiving: optional (see #TpBaseCallStream:can-request-receiving);
  *  virtual method called when user requested receiving from the given remote
  *  contact. This virtual method should be implemented instead of
- *  #TpBaseCallStream.request_receiving
+ *  #TpBaseCallStreamClass.request_receiving
  * @set_sending: mandatory; virtual method called when user requested to
  *  start/stop sending to remote contacts. This virtual method should be
- *  implemented instead of #TpBaseCallStream.set_sending
+ *  implemented instead of #TpBaseCallStreamClass.set_sending
  *
  * The class structure for #TpBaseMediaCallStream
  *
diff --git a/telepathy-glib/base-password-channel.c b/telepathy-glib/base-password-channel.c
index 6e3b53288..f6e230850 100644
--- a/telepathy-glib/base-password-channel.c
+++ b/telepathy-glib/base-password-channel.c
@@ -385,7 +385,7 @@ tp_base_password_channel_class_init (TpBasePasswordChannelClass *tp_base_passwor
       param_spec);
 
   /**
-   * TpBasePasswordChannel::finished
+   * TpBasePasswordChannel::finished:
    * @password: the password provided by the user, or %NULL if the
    * authentication has been aborted
    * @domain: domain of a #GError indicating why the authentication has been
diff --git a/telepathy-glib/call-channel.c b/telepathy-glib/call-channel.c
index 092334132..1bfa2c430 100644
--- a/telepathy-glib/call-channel.c
+++ b/telepathy-glib/call-channel.c
@@ -878,7 +878,7 @@ tp_call_channel_class_init (TpCallChannelClass *klass)
   /**
    * TpCallChannel:state:
    *
-   * A #TpChannelCallState specifying the state of the call.
+   * A #TpCallState specifying the state of the call.
    *
    * Since: 0.17.5
    */
@@ -1047,7 +1047,7 @@ tp_call_channel_class_init (TpCallChannelClass *klass)
 
 
   /**
-   * TpCallChannel::content-added
+   * TpCallChannel::content-added:
    * @self: the #TpCallChannel
    * @content: the newly added #TpCallContent
    *
@@ -1067,7 +1067,7 @@ tp_call_channel_class_init (TpCallChannelClass *klass)
       1, G_TYPE_OBJECT);
 
   /**
-   * TpCallChannel::content-removed
+   * TpCallChannel::content-removed:
    * @self: the #TpCallChannel
    * @content: the newly removed #TpCallContent
    * @reason: a #TpCallStateReason
@@ -1088,7 +1088,7 @@ tp_call_channel_class_init (TpCallChannelClass *klass)
       2, G_TYPE_OBJECT, TP_TYPE_CALL_STATE_REASON);
 
   /**
-   * TpCallChannel::state-changed
+   * TpCallChannel::state-changed:
    * @self: the #TpCallChannel
    * @state: the new #TpCallState
    * @flags: the new #TpCallFlags
@@ -1110,7 +1110,7 @@ tp_call_channel_class_init (TpCallChannelClass *klass)
       G_TYPE_HASH_TABLE);
 
   /**
-   * TpCallChannel::members-changed
+   * TpCallChannel::members-changed:
    * @self: the #TpCallChannel
    * @updates: (type GLib.HashTable) (element-type TelepathyGLib.Contact uint):
    *   #GHashTable mapping #TpContact to its new #TpCallMemberFlags
@@ -1345,7 +1345,7 @@ tp_call_channel_get_members (TpCallChannel *self)
  * tp_call_channel_has_dtmf:
  * @self: a #TpCallChannel
  *
- * Whether or not %self can send DTMF tones using
+ * Whether or not @self can send DTMF tones using
  * tp_call_channel_send_tones_async(). To be able to send DTMF tones, at least
  * one of @self's #TpCallChannel:contents must implement
  * %TP_IFACE_CALL_CONTENT_INTERFACE_DTMF interface.
@@ -1377,7 +1377,7 @@ tp_call_channel_has_dtmf (TpCallChannel *self)
  * tp_call_channel_has_hold:
  * @self: a #TpCallChannel
  *
- * Whether or not %self has the %TP_IFACE_CHANNEL_INTERFACE_HOLD
+ * Whether or not @self has the %TP_IFACE_CHANNEL_INTERFACE_HOLD
  * interfaces
  *
  * Returns: whether or not @self supports Hold
@@ -1791,7 +1791,7 @@ tp_call_channel_send_tones_finish (TpCallChannel *self,
  * @user_data: data to pass to @callback
  *
  * Requests that the connection manager holds or unholds the call. Watch
- * #TpCallChannel::hold-state property to know when the channel goes on
+ * #TpCallChannel:hold-state property to know when the channel goes on
  * hold or is unheld. Unholding may fail if the streaming implementation
  * can not obtain all the resources needed to restart the call.
  *
diff --git a/telepathy-glib/call-content-media-description.c b/telepathy-glib/call-content-media-description.c
index 153d5787b..ff3725cf2 100644
--- a/telepathy-glib/call-content-media-description.c
+++ b/telepathy-glib/call-content-media-description.c
@@ -107,7 +107,7 @@ enum
   PROP_PACKET_RECEIPT_TIMES_MAX_SIZE,
   PROP_DLRR_MAX_SIZE,
   PROP_RTT_MODE,
-  PROP_STATISTIC_FLAGS,
+  PROP_STATISTICS_FLAGS,
   PROP_ENABLE_METRICS,
 };
 
@@ -136,7 +136,7 @@ struct _TpCallContentMediaDescriptionPrivate
   guint packet_receipt_times_max_size;
   guint dlrr_max_size;
   TpRCPTXRRTTMode rtt_mode;
-  TpRTCPXRStatisticsFlags statistic_flags;
+  TpRTCPXRStatisticsFlags statistics_flags;
   gboolean enable_metrics;
 
   GSimpleAsyncResult *result;
@@ -255,8 +255,8 @@ tp_call_content_media_description_get_property (GObject *object,
       case PROP_RTT_MODE:
         g_value_set_uint (value, self->priv->rtt_mode);
         break;
-      case PROP_STATISTIC_FLAGS:
-        g_value_set_uint (value, self->priv->statistic_flags);
+      case PROP_STATISTICS_FLAGS:
+        g_value_set_uint (value, self->priv->statistics_flags);
         break;
       case PROP_ENABLE_METRICS:
         g_value_set_boolean (value, self->priv->enable_metrics);
@@ -623,7 +623,7 @@ tp_call_content_media_description_class_init (
       "that are sent, and whether to send VoIP Metrics Report Blocks.",
       0, G_MAXUINT, 0,
       G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_STATISTIC_FLAGS, spec);
+  g_object_class_install_property (object_class, PROP_STATISTICS_FLAGS, spec);
 
   /**
    * TpCallContentMediaDescription:enable-metrics:
@@ -662,7 +662,7 @@ tp_call_content_media_description_class_init (
  * tp_call_content_media_description_add_ssrc().
  *
  * Once all information has been filled, the media description can be offered
- * using tp_base_media_call_content_offer_media_description().
+ * using tp_base_media_call_content_offer_media_description_async().
  *
  * Returns: a new #TpCallContentMediaDescription.
  * Since: 0.17.5
@@ -880,7 +880,7 @@ tp_call_content_media_description_add_rtcp_extended_reports_interface (
  * @parameters: Feedback parameters as a string. Format is defined in the
  *  relevant RFC.
  *
- * Add an element to the #TpCallContentMediaDescription:rtp-header-extensions
+ * Add an element to the #TpCallContentMediaDescription:header-extensions
  * property.
  *
  * Implement
@@ -1064,9 +1064,9 @@ tp_call_content_media_description_set_does_avpf (
  * @dlrr_max_size: the value for
  *  #TpCallContentMediaDescription:dlrr-max-size property.
  * @rtt_mode: the value for
- *  #TpCallContentMediaDescription:rtt-mpde property.
- * @statistic_flags: the value for
- *  #TpCallContentMediaDescription:statistic-flags property.
+ *  #TpCallContentMediaDescription:rtt-mode property.
+ * @statistics_flags: the value for
+ *  #TpCallContentMediaDescription:statistics-flags property.
  * @enable_metrics: the value for
  *  #TpCallContentMediaDescription:enable-metrics property.
  *
@@ -1084,7 +1084,7 @@ tp_call_content_media_description_set_rtcp_extended_reports (
     guint packet_receipt_times_max_size,
     guint dlrr_max_size,
     TpRCPTXRRTTMode rtt_mode,
-    TpRTCPXRStatisticsFlags statistic_flags,
+    TpRTCPXRStatisticsFlags statistics_flags,
     gboolean enable_metrics)
 {
   g_return_if_fail (TP_IS_CALL_CONTENT_MEDIA_DESCRIPTION (self));
@@ -1094,7 +1094,7 @@ tp_call_content_media_description_set_rtcp_extended_reports (
   self->priv->packet_receipt_times_max_size = packet_receipt_times_max_size;
   self->priv->dlrr_max_size = dlrr_max_size;
   self->priv->rtt_mode = rtt_mode;
-  self->priv->statistic_flags = statistic_flags;
+  self->priv->statistics_flags = statistics_flags;
   self->priv->enable_metrics = enable_metrics;
 
   tp_call_content_media_description_add_rtcp_extended_reports_interface (self);
diff --git a/telepathy-glib/call-content-media-description.h b/telepathy-glib/call-content-media-description.h
index 2ea3e790b..b03df367d 100644
--- a/telepathy-glib/call-content-media-description.h
+++ b/telepathy-glib/call-content-media-description.h
@@ -128,7 +128,7 @@ void tp_call_content_media_description_set_rtcp_extended_reports (
     guint packet_receipt_times_max_size,
     guint dlrr_max_size,
     TpRCPTXRRTTMode rtt_mode,
-    TpRTCPXRStatisticsFlags statistic_flags,
+    TpRTCPXRStatisticsFlags statistics_flags,
     gboolean enable_metrics);
 
 void tp_call_content_media_description_add_rtp_header_extensions_interface (
diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c
index ae3360a5f..4a8aea037 100644
--- a/telepathy-glib/call-content.c
+++ b/telepathy-glib/call-content.c
@@ -655,7 +655,7 @@ tp_call_content_class_init (TpCallContentClass *klass)
 
 
   /**
-   * TpCallContent::removed
+   * TpCallContent::removed:
    * @self: the #TpCallContent
    *
    * The ::removed signal is emitted when @self is removed from
@@ -671,7 +671,7 @@ tp_call_content_class_init (TpCallContentClass *klass)
       0);
 
   /**
-   * TpCallContent::streams-added
+   * TpCallContent::streams-added:
    * @self: the #TpCallContent
    * @streams: (type GLib.PtrArray) (element-type TelepathyGLib.CallStream):
    *  a #GPtrArray of newly added #TpCallStream
@@ -692,7 +692,7 @@ tp_call_content_class_init (TpCallContentClass *klass)
       1, G_TYPE_PTR_ARRAY);
 
   /**
-   * TpCallContent::streams-removed
+   * TpCallContent::streams-removed:
    * @self: the #TpCallContent
    * @streams: (type GLib.PtrArray) (element-type TelepathyGLib.CallStream):
    *  a #GPtrArray of newly removed #TpCallStream
diff --git a/telepathy-glib/call-stream-endpoint.c b/telepathy-glib/call-stream-endpoint.c
index a4e8821b5..4a92648ee 100644
--- a/telepathy-glib/call-stream-endpoint.c
+++ b/telepathy-glib/call-stream-endpoint.c
@@ -433,7 +433,7 @@ tp_call_stream_endpoint_class_init (TpCallStreamEndpointClass *klass)
       G_STRUCT_OFFSET (TpCallStreamEndpointClass, dbus_props_class));
 
   /**
-   * TpCallStreamEndpoint::candidate-selected
+   * TpCallStreamEndpoint::candidate-selected:
    * @self: the #TpCallStreamEndpoint
    * @local_candidate: the local candidate
    * @remote_candidate: the remote candidate
@@ -451,7 +451,7 @@ tp_call_stream_endpoint_class_init (TpCallStreamEndpointClass *klass)
       2, TP_STRUCT_TYPE_CANDIDATE, TP_STRUCT_TYPE_CANDIDATE);
 
   /**
-   * TpCallStreamEndpoint::candidate-accepted
+   * TpCallStreamEndpoint::candidate-accepted:
    * @self: the #TpCallStreamEndpoint
    * @local_candidate: the local candidate
    * @remote_candidate: the remote candidate
@@ -469,7 +469,7 @@ tp_call_stream_endpoint_class_init (TpCallStreamEndpointClass *klass)
       2, TP_STRUCT_TYPE_CANDIDATE, TP_STRUCT_TYPE_CANDIDATE);
 
   /**
-   * TpCallStreamEndpoint::candidate-rejected
+   * TpCallStreamEndpoint::candidate-rejected:
    * @self: the #TpCallStreamEndpoint
    * @local_candidate: the local candidate
    * @remote_candidate: the remote candidate
diff --git a/telepathy-glib/call-stream.c b/telepathy-glib/call-stream.c
index 67926e147..7ead22462 100644
--- a/telepathy-glib/call-stream.c
+++ b/telepathy-glib/call-stream.c
@@ -408,7 +408,7 @@ tp_call_stream_class_init (TpCallStreamClass *klass)
       param_spec);
 
   /**
-   * TpCallStream::local-sending-state-changed
+   * TpCallStream::local-sending-state-changed:
    * @self: the #TpCallStream
    * @state: the new #TpSendingState
    * @reason: the #TpCallStateReason for the change
@@ -427,7 +427,7 @@ tp_call_stream_class_init (TpCallStreamClass *klass)
       G_TYPE_HASH_TABLE);
 
   /**
-   * TpCallStream::remote-members-changed
+   * TpCallStream::remote-members-changed:
    * @self: the #TpCallStream
    * @updates: (type GLib.HashTable) (element-type TelepathyGLib.Contact uint):
    *   #GHashTable mapping #TpContact to its new #TpSendingState
@@ -512,7 +512,7 @@ tp_call_stream_get_feature_quark_core (void)
  *
  * <!-- -->
  *
- * Returns: the value of #TpCallStream:local-seding-state
+ * Returns: the value of #TpCallStream:local-sending-state
  * Since: 0.17.5
  */
 TpSendingState
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index 5a27879e9..a404624d8 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -1752,7 +1752,7 @@ tp_channel_init_known_interfaces (void)
 }
 
 /**
- * tp_channel_get_requested: (skip)
+ * tp_channel_get_requested:
  * @self: a #TpChannel
  *
  * Return the #TpChannel:requested property
diff --git a/telepathy-glib/cm-message.c b/telepathy-glib/cm-message.c
index ab83a2709..353ede957 100644
--- a/telepathy-glib/cm-message.c
+++ b/telepathy-glib/cm-message.c
@@ -95,7 +95,7 @@ tp_cm_message_init (TpCMMessage *self)
  * <!-- nothing more to say -->
  *
  * Returns: a newly allocated message suitable to be passed to
- * tp_cm_message_mixin_take_received
+ * tp_cm_message_mixin_take_received()
  *
  * Since: 0.13.9
  */
diff --git a/telepathy-glib/dbus-properties-mixin.c b/telepathy-glib/dbus-properties-mixin.c
index 2bc3f8c47..d8c39e520 100644
--- a/telepathy-glib/dbus-properties-mixin.c
+++ b/telepathy-glib/dbus-properties-mixin.c
@@ -1040,7 +1040,7 @@ tp_dbus_properties_mixin_emit_properties_changed (
  * tp_dbus_properties_mixin_emit_properties_changed_varargs: (skip)
  * @object: an object which uses the D-Bus properties mixin
  * @interface_name: the interface on which properties have changed
- * @...: (unqualified) property names whose values have changed, terminated by
+ * @...: property names (unqualified) whose values have changed, terminated by
  *  %NULL.
  *
  * A shortcut for calling tp_dbus_properties_mixin_emit_properties_changed().
diff --git a/telepathy-glib/dbus-tube-channel.c b/telepathy-glib/dbus-tube-channel.c
index 2680fae3a..d5491f429 100644
--- a/telepathy-glib/dbus-tube-channel.c
+++ b/telepathy-glib/dbus-tube-channel.c
@@ -476,7 +476,7 @@ _tp_dbus_tube_channel_new_with_factory (
 }
 
 /**
- * tp_dbus_tube_channel_get_service_name: (skip)
+ * tp_dbus_tube_channel_get_service_name:
  * @self: a #TpDBusTubeChannel
  *
  * Return the #TpDBusTubeChannel:service-name property
@@ -598,7 +598,7 @@ out:
 }
 
 /**
- * tp_dbus_tube_channel_offer_async
+ * tp_dbus_tube_channel_offer_async:
  * @self: an outgoing #TpDBusTubeChannel
  * @params: (allow-none) (transfer none): parameters of the tube, or %NULL
  * @callback: a callback to call when the tube has been offered
@@ -712,7 +712,7 @@ proxy_prepare_accept_cb (GObject *source,
 }
 
 /**
- * tp_dbus_tube_channel_accept_async
+ * tp_dbus_tube_channel_accept_async:
  * @self: an incoming #TpDBusTubeChannel
  * @callback: a callback to call when the tube has been offered
  * @user_data: data to pass to @callback
diff --git a/telepathy-glib/debug-sender.c b/telepathy-glib/debug-sender.c
index 9639598b9..4340ed671 100644
--- a/telepathy-glib/debug-sender.c
+++ b/telepathy-glib/debug-sender.c
@@ -262,7 +262,7 @@ tp_debug_sender_class_init (TpDebugSenderClass *klass)
   object_class->constructed = tp_debug_sender_constructed;
 
   /**
-   * TpDebugSender:enabled
+   * TpDebugSender:enabled:
    *
    * %TRUE if the NewDebugMessage signal should be emitted when a new debug
    * message is generated.
diff --git a/telepathy-glib/errors.c b/telepathy-glib/errors.c
index 1884e5154..7c69c9d60 100644
--- a/telepathy-glib/errors.c
+++ b/telepathy-glib/errors.c
@@ -182,40 +182,40 @@
  * @TP_ERROR_CERT_REVOKED: im.telepathy1.Error.Cert.Revoked:
  *     Raised if the server provided an SSL/TLS certificate that has been
  *     revoked.
- *     Since: 0.11.12
+ *     Since 0.11.12
  * @TP_ERROR_CERT_INSECURE: im.telepathy1.Error.Cert.Insecure:
  *     Raised if the server provided an SSL/TLS certificate that uses an
  *     insecure cipher algorithm or is cryptographically weak.
- *     Since: 0.11.12
+ *     Since 0.11.12
  * @TP_ERROR_CERT_LIMIT_EXCEEDED: im.telepathy1.Error.Cert.LimitExceeded:
  *     Raised if the length in bytes of the server certificate, or the depth
  *     of the server certificate chain, exceed the limits imposed by the
  *     crypto library.
- *     Since: 0.11.12
+ *     Since 0.11.12
  * @TP_ERROR_NOT_YET: im.telepathy1.Error.NotYet:
  *     Raised when the requested functionality is not yet available, but is
  *     likely to become available after some time has passed.
- *     Since: 0.11.15
+ *     Since 0.11.15
  * @TP_ERROR_REJECTED: im.telepathy1.Error.Rejected:
  *     Raised when an incoming or outgoing call is rejected by the receiving
  *     contact.
- *     Since: 0.13.2
+ *     Since 0.13.2
  * @TP_ERROR_PICKED_UP_ELSEWHERE: im.telepathy1.Error.PickedUpElsewhere:
  *     Raised when a call was terminated as a result of the local user
  *     picking up the call on a different resource.
- *     Since: 0.13.3
+ *     Since 0.13.3
  * @TP_ERROR_CONFUSED: im.telepathy1.Error.Confused:
  *     Raised if a server rejects protocol messages from a connection manager
  *     claiming that they do not make sense, two local processes fail to
  *     understand each other, or an apparently impossible situation is
  *     reached. This has a similar meaning to %TP_DBUS_ERROR_INCONSISTENT but
  *     can be passed between processes via D-Bus.
- *     Since: 0.13.7
+ *     Since 0.13.7
  * @TP_ERROR_SERVICE_CONFUSED: im.telepathy1.Error.ServiceConfused:
  *     Raised when a server or other piece of infrastructure indicates an
  *     internal error, or when a message that makes no sense is received from
  *     a server or other piece of infrastructure.
- *     Since: 0.13.7
+ *     Since 0.13.7
  * @TP_ERROR_EMERGENCY_CALLS_NOT_SUPPORTED:
  *   im.telepathy1.Error.EmergencyCallsNotSupported:
  *     Raised when a client attempts to dial a number that is recognized as an
@@ -236,17 +236,17 @@
  *   <code>im.telepathy1.Error.Media.CodecsIncompatible</code>:
  *     Raised when the local streaming implementation has no codecs in common
  *     with the remote side.
- *     Since: 0.15.6
+ *     Since 0.15.6
  * @TP_ERROR_MEDIA_UNSUPPORTED_TYPE:
  *   <code>im.telepathy1.Error.Media.UnsupportedType</code>:
  *     The media stream type requested is not supported by either the local or
  *     remote side.
- *     Since: 0.15.6
+ *     Since 0.15.6
  * @TP_ERROR_MEDIA_STREAMING_ERROR:
  *   <code>im.telepathy1.Error.Media.StreamingError</code>:
  *     Raised when the call's streaming implementation has some kind of internal
  *     error.
- *     Since: 0.15.6
+ *     Since 0.15.6
  * @TP_ERROR_CAPTCHA_NOT_SUPPORTED:
  *   <code>im.telepathy1.Error.Media.CaptchaNotSupported</code>:
  *     Raised if no UI is available to present captchas, or if one is
diff --git a/telepathy-glib/gnio-util.c b/telepathy-glib/gnio-util.c
index b6278eb4a..625854e92 100644
--- a/telepathy-glib/gnio-util.c
+++ b/telepathy-glib/gnio-util.c
@@ -337,7 +337,7 @@ _tp_unix_connection_send_credentials_with_byte (GUnixConnection *connection,
 #endif
 
 /**
- * tp_unix_connection_send_credentials_with_byte
+ * tp_unix_connection_send_credentials_with_byte:
  * @connection: a #GUnixConnection
  * @byte: the byte to send with the credentials
  * @cancellable: (allow-none): a #GCancellable, or %NULL
diff --git a/telepathy-glib/handle.h b/telepathy-glib/handle.h
index 79ad09737..63743e28b 100644
--- a/telepathy-glib/handle.h
+++ b/telepathy-glib/handle.h
@@ -49,7 +49,7 @@ typedef guint TpHandle;
 #define TP_TYPE_HANDLE G_TYPE_UINT
 
 /**
- * TP_UNKNOWN_HANDLE_TYPE
+ * TP_UNKNOWN_HANDLE_TYPE:
  *
  * An invalid handle type (-1 cast to TpHandleType) used to represent an
  * unknown handle type.
diff --git a/telepathy-glib/presence-mixin.c b/telepathy-glib/presence-mixin.c
index 6cb451da8..e9d70b5ab 100644
--- a/telepathy-glib/presence-mixin.c
+++ b/telepathy-glib/presence-mixin.c
@@ -77,7 +77,7 @@
  */
 
 /**
- * TpPresenceStatusOptionalArgumentSpec
+ * TpPresenceStatusOptionalArgumentSpec:
  * @name: Name of the argument as passed over D-Bus
  * @dtype: D-Bus type signature of the argument
  *
@@ -89,7 +89,7 @@
  */
 
 /**
- * TpPresenceStatusSpec
+ * TpPresenceStatusSpec:
  * @name: String identifier of the presence status
  * @presence_type: A type value, as specified by #TpConnectionPresenceType
  * @self: Indicates if this status may be set on yourself
@@ -268,7 +268,7 @@ static GHashTable *construct_presence_hash (
   const TpPresenceStatusSpec *supported_statuses,
   GHashTable *contact_statuses);
 
-/**
+/*
  * deep_copy_hashtable
  *
  * Make a deep copy of a GHashTable.
@@ -748,8 +748,8 @@ tp_presence_mixin_init_dbus_properties (GObjectClass *cls)
       NULL, known_presence_props);
 }
 
-/**
- * tp_presence_mixin_set_presence: (skip)
+/*
+ * tp_presence_mixin_set_presence:
  *
  * Implements D-Bus method SetPresence
  * on interface im.telepathy1.Connection.Interface.Presence
@@ -879,8 +879,8 @@ construct_presence_hash (const TpPresenceStatusSpec *supported_statuses,
   return presence_hash;
 }
 
-/**
- * tp_presence_mixin_get_presence: (skip)
+/*
+ * tp_presence_mixin_get_presence:
  *
  * Implements D-Bus method GetPresence
  * on interface im.telepathy1.Connection.Interface.Presence
diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index 7e3d6603b..ee9f8f851 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -604,7 +604,7 @@ tp_protocol_class_init (TpProtocolClass *klass)
         G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   /**
-   * TpProtocol:protocol-properties
+   * TpProtocol:protocol-properties:
    *
    * The immutable properties of this Protocol, as provided at construction
    * time. This is a map from string to #GValue, which must not be modified.
@@ -1068,7 +1068,7 @@ tp_protocol_get_icon_name (TpProtocol *self)
 }
 
 /**
- * tp_protocol_get_authentication_types
+ * tp_protocol_get_authentication_types:
  * @self: a protocol object
  *
  *
@@ -1681,7 +1681,7 @@ _tp_protocol_parse_manager_file (GKeyFile *file,
 }
 
 /**
- * tp_protocol_get_avatar_requirements
+ * tp_protocol_get_avatar_requirements:
  * @self: a #TpProtocol
  *
  * Return the #TpProtocol:avatar-requirements property
diff --git a/telepathy-glib/simple-client-factory.c b/telepathy-glib/simple-client-factory.c
index 8f3009e85..852e9a337 100644
--- a/telepathy-glib/simple-client-factory.c
+++ b/telepathy-glib/simple-client-factory.c
@@ -79,15 +79,6 @@
 
 /**
  * TpSimpleClientFactoryClass:
- * @parent_class: the parent class
- *
- * The class of a #TpSimpleClientFactory.
- *
- * Since: 0.15.5
- */
-
-/**
- * TpSimpleClientFactoryClass:
  * @parent_class: the parent
  * @create_account: create a #TpAccount;
  *  see tp_simple_client_factory_ensure_account()
diff --git a/telepathy-glib/stream-tube-channel.c b/telepathy-glib/stream-tube-channel.c
index 473fac0ce..a766bd119 100644
--- a/telepathy-glib/stream-tube-channel.c
+++ b/telepathy-glib/stream-tube-channel.c
@@ -440,7 +440,7 @@ tp_stream_tube_channel_class_init (TpStreamTubeChannelClass *klass)
   g_object_class_install_property (gobject_class, PROP_PARAMETERS, param_spec);
 
   /**
-   * TpStreamTubeChannel::incoming
+   * TpStreamTubeChannel::incoming:
    * @self: the #TpStreamTubeChannel
    * @tube_connection: the #TpStreamTubeConnection for the connection
    *
@@ -1512,7 +1512,7 @@ tp_stream_tube_channel_offer_finish (TpStreamTubeChannel *self,
 }
 
 /**
- * tp_stream_tube_channel_get_service: (skip)
+ * tp_stream_tube_channel_get_service:
  * @self: a #TpStreamTubeChannel
  *
  * Return the #TpStreamTubeChannel:service property
diff --git a/telepathy-glib/stream-tube-connection.c b/telepathy-glib/stream-tube-connection.c
index 67e657341..03ea60dc1 100644
--- a/telepathy-glib/stream-tube-connection.c
+++ b/telepathy-glib/stream-tube-connection.c
@@ -239,7 +239,7 @@ tp_stream_tube_connection_class_init (TpStreamTubeConnectionClass *cls)
   g_object_class_install_property (object_class, PROP_CONTACT, param_spec);
 
   /**
-   * TpStreamTubeConnection::closed
+   * TpStreamTubeConnection::closed:
    * @self: the #TpStreamTubeConnection
    * @error: (transfer none): a #GError representing the error reported by the
    * connection manager
@@ -254,7 +254,7 @@ tp_stream_tube_connection_class_init (TpStreamTubeConnectionClass *cls)
       G_SIGNAL_RUN_LAST,
       0, NULL, NULL, NULL,
       G_TYPE_NONE,
-      1, G_TYPE_POINTER);
+      1, G_TYPE_ERROR);
 }
 
 TpStreamTubeConnection *
@@ -269,7 +269,7 @@ _tp_stream_tube_connection_new (
 }
 
 /**
- * tp_stream_tube_connection_get_socket_connection: (skip)
+ * tp_stream_tube_connection_get_socket_connection:
  * @self: a #TpStreamTubeConnection
  *
  * Return the #TpStreamTubeConnection:socket-connection property
@@ -285,7 +285,7 @@ tp_stream_tube_connection_get_socket_connection (TpStreamTubeConnection *self)
 }
 
 /**
- * tp_stream_tube_connection_get_channel: (skip)
+ * tp_stream_tube_connection_get_channel:
  * @self: a #TpStreamTubeConnection
  *
  * Return the #TpStreamTubeConnection:channel property
@@ -302,7 +302,7 @@ tp_stream_tube_connection_get_channel (
 }
 
 /**
- * tp_stream_tube_connection_get_contact: (skip)
+ * tp_stream_tube_connection_get_contact:
  * @self: a #TpStreamTubeConnection
  *
  * Return the #TpStreamTubeConnection:contact property
diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index b2caf08fe..808c56436 100644
--- a/telepathy-glib/text-channel.c
+++ b/telepathy-glib/text-channel.c
@@ -930,7 +930,7 @@ tp_text_channel_class_init (TpTextChannelClass *klass)
   g_object_class_install_property (gobject_class, PROP_SMS_FLASH, param_spec);
 
   /**
-   * TpTextChannel::message-received
+   * TpTextChannel::message-received:
    * @self: the #TpTextChannel
    * @message: a #TpSignalledMessage
    *
@@ -958,7 +958,7 @@ tp_text_channel_class_init (TpTextChannelClass *klass)
       1, TP_TYPE_SIGNALLED_MESSAGE);
 
   /**
-   * TpTextChannel::pending-message-removed
+   * TpTextChannel::pending-message-removed:
    * @self: the #TpTextChannel
    * @message: a #TpSignalledMessage
    *
@@ -983,7 +983,7 @@ tp_text_channel_class_init (TpTextChannelClass *klass)
       1, TP_TYPE_SIGNALLED_MESSAGE);
 
   /**
-   * TpTextChannel::message-sent
+   * TpTextChannel::message-sent:
    * @self: the #TpTextChannel
    * @message: a #TpSignalledMessage
    * @flags: the #TpMessageSendingFlags affecting how the message was sent
@@ -1077,7 +1077,7 @@ _tp_text_channel_new_with_factory (
 }
 
 /**
- * tp_text_channel_get_supported_content_types: (skip)
+ * tp_text_channel_get_supported_content_types:
  * @self: a #TpTextChannel
  *
  * Return the #TpTextChannel:supported-content-types property
@@ -1096,7 +1096,7 @@ tp_text_channel_get_supported_content_types (TpTextChannel *self)
 }
 
 /**
- * tp_text_channel_get_message_part_support_flags: (skip)
+ * tp_text_channel_get_message_part_support_flags:
  * @self: a #TpTextChannel
  *
  * Return the #TpTextChannel:message-part-support-flags property
@@ -1115,7 +1115,7 @@ tp_text_channel_get_message_part_support_flags (
 }
 
 /**
- * tp_text_channel_get_delivery_reporting_support: (skip)
+ * tp_text_channel_get_delivery_reporting_support:
  * @self: a #TpTextChannel
  *
  * Return the #TpTextChannel:delivery-reporting-support property
@@ -1547,7 +1547,7 @@ tp_text_channel_set_chat_state_finish (TpTextChannel *self,
 }
 
 /**
- * tp_text_channel_get_message_types: (skip)
+ * tp_text_channel_get_message_types:
  * @self: a #TpTextChannel
  *
  * Return the #TpTextChannel:message-types property
@@ -1566,7 +1566,7 @@ tp_text_channel_get_message_types (TpTextChannel *self)
 }
 
 /**
- * tp_text_channel_supports_message_type
+ * tp_text_channel_supports_message_type:
  * @self: a #TpTextChannel
  * @message_type: a #TpChannelTextMessageType
  *
diff --git a/tools/c-constants-gen.py b/tools/c-constants-gen.py
index bc0484973..c74d4fdc9 100644
--- a/tools/c-constants-gen.py
+++ b/tools/c-constants-gen.py
@@ -67,8 +67,7 @@ extern "C" {
                        flags.getAttribute('name')
         self.d("""\
 /**
- *
-%s:
+ * %s:
 """ % (self.prefix + name).replace('_', ''))
         for flag in get_by_path(flags, 'flag'):
             self.do_gtkdoc(flag, value_prefix)