Fix doc comments for recent stricter gtk-doc

 * Build fails with new gtk-doc (1.18.1) which seems to
   be stricter than previous versions.

[Also fixes g-ir-scanner warnings, which were what was actually fatal. -smcv]

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=48592
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

18 files changed, 61 insertions, 83 deletions

diff --git a/telepathy-glib/account.c b/telepathy-glib/account.c
index 66d2d4e10..005a29d8b 100644
--- a/telepathy-glib/account.c
+++ b/telepathy-glib/account.c
@@ -1723,7 +1723,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.
    *
@@ -1826,7 +1826,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
@@ -1925,7 +1925,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-client.c b/telepathy-glib/base-client.c
index 6f9277b5d..26cd1cb37 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
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 44cb4b125..fa026e8db 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -160,7 +160,7 @@
  * @create_channel_managers: Create an array of channel managers for this
  *  Connection. At least one of this or @create_channel_factories must be set
  *  by subclasses to a non-%NULL value.
- *  Since: 0.7.15
+ *  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/call-channel.c b/telepathy-glib/call-channel.c
index f7d6705b8..6e88061fd 100644
--- a/telepathy-glib/call-channel.c
+++ b/telepathy-glib/call-channel.c
@@ -1046,7 +1046,7 @@ tp_call_channel_class_init (TpCallChannelClass *klass)
 
 
   /**
-   * TpCallChannel::content-added
+   * TpCallChannel::content-added:
    * @self: the #TpCallChannel
    * @content: the newly added #TpCallContent
    *
@@ -1066,7 +1066,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
@@ -1087,7 +1087,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
@@ -1109,7 +1109,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
diff --git a/telepathy-glib/call-content.c b/telepathy-glib/call-content.c
index 96584d44a..7db411177 100644
--- a/telepathy-glib/call-content.c
+++ b/telepathy-glib/call-content.c
@@ -653,7 +653,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
@@ -669,7 +669,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
@@ -690,7 +690,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.c b/telepathy-glib/call-stream.c
index de5dd38c1..62d75d001 100644
--- a/telepathy-glib/call-stream.c
+++ b/telepathy-glib/call-stream.c
@@ -406,7 +406,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
@@ -425,7 +425,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
diff --git a/telepathy-glib/dbus-properties-mixin.c b/telepathy-glib/dbus-properties-mixin.c
index fc4319fb3..22ac713f7 100644
--- a/telepathy-glib/dbus-properties-mixin.c
+++ b/telepathy-glib/dbus-properties-mixin.c
@@ -1093,7 +1093,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
+ * @...: unqualified property names 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 28a9524f4..b796e7bc3 100644
--- a/telepathy-glib/dbus-tube-channel.c
+++ b/telepathy-glib/dbus-tube-channel.c
@@ -596,7 +596,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
@@ -710,7 +710,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/errors.c b/telepathy-glib/errors.c
index 252568795..8000d7fd3 100644
--- a/telepathy-glib/errors.c
+++ b/telepathy-glib/errors.c
@@ -182,40 +182,40 @@
  * @TP_ERROR_CERT_REVOKED: org.freedesktop.Telepathy.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: org.freedesktop.Telepathy.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: org.freedesktop.Telepathy.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: org.freedesktop.Telepathy.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: org.freedesktop.Telepathy.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: org.freedesktop.Telepathy.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: org.freedesktop.Telepathy.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: org.freedesktop.Telepathy.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:
  *   org.freedesktop.Telepathy.Error.EmergencyCallsNotSupported:
  *     Raised when a client attempts to dial a number that is recognized as an
@@ -236,17 +236,17 @@
  *   <code>org.freedesktop.Telepathy.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>org.freedesktop.Telepathy.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>org.freedesktop.Telepathy.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>org.freedesktop.Telepathy.Error.Media.CaptchaNotSupported</code>:
  *     Raised if no UI is available to present captchas, or if one is
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 2a5053567..56955dda2 100644
--- a/telepathy-glib/presence-mixin.c
+++ b/telepathy-glib/presence-mixin.c
@@ -112,7 +112,7 @@
  */
 
 /**
- * TpPresenceStatusOptionalArgumentSpec
+ * TpPresenceStatusOptionalArgumentSpec:
  * @name: Name of the argument as passed over D-Bus
  * @dtype: D-Bus type signature of the argument
  *
@@ -124,7 +124,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
@@ -303,11 +303,6 @@ static GHashTable *construct_simple_presence_hash (
   const TpPresenceStatusSpec *supported_statuses,
   GHashTable *contact_statuses);
 
-/**
- * deep_copy_hashtable
- *
- * Make a deep copy of a GHashTable.
- */
 static GHashTable *
 deep_copy_hashtable (GHashTable *hash_table)
 {
@@ -650,12 +645,11 @@ tp_presence_mixin_emit_one_presence_update (GObject *obj,
 
 /**
  * tp_presence_mixin_add_status: (skip)
+ * @context: The D-Bus invocation context to use to return values
+ *           or throw an error.
  *
  * Implements D-Bus method AddStatus
  * on interface org.freedesktop.Telepathy.Connection.Interface.Presence
- *
- * @context: The D-Bus invocation context to use to return values
- *           or throw an error.
  */
 static void
 tp_presence_mixin_add_status (TpSvcConnectionInterfacePresence *iface,
@@ -677,12 +671,11 @@ tp_presence_mixin_add_status (TpSvcConnectionInterfacePresence *iface,
 
 /**
  * tp_presence_mixin_clear_status: (skip)
+ * @context: The D-Bus invocation context to use to return values
+ *           or throw an error.
  *
  * Implements D-Bus method ClearStatus
  * on interface org.freedesktop.Telepathy.Connection.Interface.Presence
- *
- * @context: The D-Bus invocation context to use to return values
- *           or throw an error.
  */
 static void
 tp_presence_mixin_clear_status (TpSvcConnectionInterfacePresence *iface,
@@ -711,12 +704,11 @@ tp_presence_mixin_clear_status (TpSvcConnectionInterfacePresence *iface,
 
 /**
  * tp_presence_mixin_get_presence: (skip)
+ * @context: The D-Bus invocation context to use to return values
+ *           or throw an error.
  *
  * Implements D-Bus method GetPresence
  * on interface org.freedesktop.Telepathy.Connection.Interface.Presence
- *
- * @context: The D-Bus invocation context to use to return values
- *           or throw an error.
  */
 static void
 tp_presence_mixin_get_presence (TpSvcConnectionInterfacePresence *iface,
@@ -834,12 +826,11 @@ check_status_available (GObject *object,
 
 /**
  * tp_presence_mixin_get_statuses: (skip)
+ * @context: The D-Bus invocation context to use to return values
+ *           or throw an error.
  *
  * Implements D-Bus method GetStatuses
  * on interface org.freedesktop.Telepathy.Connection.Interface.Presence
- *
- * @context: The D-Bus invocation context to use to return values
- *           or throw an error.
  */
 static void
 tp_presence_mixin_get_statuses (TpSvcConnectionInterfacePresence *iface,
@@ -902,12 +893,11 @@ tp_presence_mixin_get_statuses (TpSvcConnectionInterfacePresence *iface,
 
 /**
  * tp_presence_mixin_set_last_activity_time: (skip)
+ * @context: The D-Bus invocation context to use to return values
+ *           or throw an error.
  *
  * Implements D-Bus method SetLastActivityTime
  * on interface org.freedesktop.Telepathy.Connection.Interface.Presence
- *
- * @context: The D-Bus invocation context to use to return values
- *           or throw an error.
  */
 static void
 tp_presence_mixin_set_last_activity_time (TpSvcConnectionInterfacePresence *iface,
@@ -925,12 +915,11 @@ tp_presence_mixin_set_last_activity_time (TpSvcConnectionInterfacePresence *ifac
 
 /**
  * tp_presence_mixin_remove_status: (skip)
+ * @context: The D-Bus invocation context to use to return values
+ *           or throw an error.
  *
  * Implements D-Bus method RemoveStatus
  * on interface org.freedesktop.Telepathy.Connection.Interface.Presence
- *
- * @context: The D-Bus invocation context to use to return values
- *           or throw an error.
  */
 static void
 tp_presence_mixin_remove_status (TpSvcConnectionInterfacePresence *iface,
@@ -1001,12 +990,12 @@ tp_presence_mixin_remove_status (TpSvcConnectionInterfacePresence *iface,
 
 /**
  * tp_presence_mixin_request_presence: (skip)
+ * @context: The D-Bus invocation context to use to return values
+ *           or throw an error.
  *
  * Implements D-Bus method RequestPresence
  * on interface org.freedesktop.Telepathy.Connection.Interface.Presence
  *
- * @context: The D-Bus invocation context to use to return values
- *           or throw an error.
  */
 static void
 tp_presence_mixin_request_presence (TpSvcConnectionInterfacePresence *iface,
@@ -1165,12 +1154,12 @@ set_status (
 
 /**
  * tp_presence_mixin_set_status: (skip)
+ * @context: The D-Bus invocation context to use to return values
+ *           or throw an error.
  *
  * Implements D-Bus method SetStatus
  * on interface org.freedesktop.Telepathy.Connection.Interface.Presence
  *
- * @context: The D-Bus invocation context to use to return values
- *           or throw an error.
  */
 static void
 tp_presence_mixin_set_status (TpSvcConnectionInterfacePresence *iface,
@@ -1370,12 +1359,11 @@ tp_presence_mixin_simple_presence_init_dbus_properties (GObjectClass *cls)
 
 /**
  * tp_presence_mixin_simple_presence_set_presence: (skip)
+ * @context: The D-Bus invocation context to use to return values
+ *           or throw an error.
  *
  * Implements D-Bus method SetPresence
  * on interface org.freedesktop.Telepathy.Connection.Interface.SimplePresence
- *
- * @context: The D-Bus invocation context to use to return values
- *           or throw an error.
  */
 static void
 tp_presence_mixin_simple_presence_set_presence (
@@ -1501,12 +1489,12 @@ construct_simple_presence_hash (const TpPresenceStatusSpec *supported_statuses,
 
 /**
  * tp_presence_mixin_get_simple_presence: (skip)
+ * @context: The D-Bus invocation context to use to return values
+ *           or throw an error.
  *
  * Implements D-Bus method GetPresence
  * on interface org.freedesktop.Telepathy.Connection.Interface.SimplePresence
  *
- * @context: The D-Bus invocation context to use to return values
- *           or throw an error.
  */
 static void
 tp_presence_mixin_simple_presence_get_presences (
diff --git a/telepathy-glib/protocol.c b/telepathy-glib/protocol.c
index 93c704443..34317a107 100644
--- a/telepathy-glib/protocol.c
+++ b/telepathy-glib/protocol.c
@@ -603,7 +603,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.
@@ -1067,7 +1067,7 @@ tp_protocol_get_icon_name (TpProtocol *self)
 }
 
 /**
- * tp_protocol_get_authentication_types
+ * tp_protocol_get_authentication_types:
  * @self: a protocol object
  *
  *
@@ -1680,7 +1680,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 0f3993d95..57fb9aff3 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 26c6afc47..4f266cf79 100644
--- a/telepathy-glib/stream-tube-channel.c
+++ b/telepathy-glib/stream-tube-channel.c
@@ -439,7 +439,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
    *
diff --git a/telepathy-glib/stream-tube-connection.c b/telepathy-glib/stream-tube-connection.c
index 5ad6adc83..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
diff --git a/telepathy-glib/text-channel.c b/telepathy-glib/text-channel.c
index 2b2fce6e6..ccbe1525b 100644
--- a/telepathy-glib/text-channel.c
+++ b/telepathy-glib/text-channel.c
@@ -946,7 +946,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
    *
@@ -974,7 +974,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
    *
@@ -999,7 +999,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
@@ -1582,7 +1582,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..0bcaaf4fb 100644
--- a/tools/c-constants-gen.py
+++ b/tools/c-constants-gen.py
@@ -67,7 +67,6 @@ extern "C" {
                        flags.getAttribute('name')
         self.d("""\
 /**
- *
 %s:
 """ % (self.prefix + name).replace('_', ''))
         for flag in get_by_path(flags, 'flag'):
diff --git a/tools/glib-gtypes-generator.py b/tools/glib-gtypes-generator.py
index e5e62904a..21dfc6aa7 100644
--- a/tools/glib-gtypes-generator.py
+++ b/tools/glib-gtypes-generator.py
@@ -91,7 +91,7 @@ class GTypesGenerator(object):
 
         docstring = get_docstring(mapping) or '(Undocumented)'
 
-        self.d('/**\n * %s:\n *\n' % name)
+        self.d('/**\n * %s:\n *\n' % name.strip())
         self.d(' * %s\n' % xml_escape(docstring))
         self.d(' *\n')
         self.d(' * This macro expands to a call to a function\n')