[Telepathy-commits] [telepathy-glib/master] Make gtkdoc 1.11 happy

[Simon McVittie]

---
 telepathy-glib/base-connection.c  |    4 ++--
 telepathy-glib/channel.c          |   10 ++++++++--
 telepathy-glib/connection.c       |   10 ++++++++--
 telepathy-glib/extra-gtkdoc.h     |    6 ++++--
 telepathy-glib/properties-mixin.c |    4 ++--
 5 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index bee1f37..e3f5507 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -631,7 +631,7 @@ exportable_channel_get_old_info (TpExportableChannel *channel,
 }
 
 
-/**
+/*
  * get_channel_details:
  * @obj: a channel, which must implement one of #TpExportableChannel and
  *       #TpChannelIface
@@ -2933,7 +2933,7 @@ conn_requests_check_basic_properties (TpBaseConnection *self,
 }
 
 
-/**
+/*
  * @target_handle: non-zero if a TargetHandle property was in the request;
  *                 zero if TargetHandle was not in the request.
  */
diff --git a/telepathy-glib/channel.c b/telepathy-glib/channel.c
index 9ac35e2..37b6023 100644
--- a/telepathy-glib/channel.c
+++ b/telepathy-glib/channel.c
@@ -63,7 +63,10 @@
  * The class of a #TpChannel. In addition to @parent_class there are four
  * pointers reserved for possible future use.
  *
- * Since: 0.7.1; structure layout visible since 0.7.12
+ * (Changed in 0.7.12: the layout of the structure is visible, allowing
+ * subclassing.)
+ *
+ * Since: 0.7.1
  */
 
 
@@ -74,7 +77,10 @@
  *
  * A proxy object for a Telepathy channel.
  *
- * Since: 0.7.1; structure layout visible since 0.7.12
+ * (Changed in 0.7.12: the layout of the structure is visible, allowing
+ * subclassing.)
+ *
+ * Since: 0.7.1
  */
 
 
diff --git a/telepathy-glib/connection.c b/telepathy-glib/connection.c
index 270aaa2..9d9cad2 100644
--- a/telepathy-glib/connection.c
+++ b/telepathy-glib/connection.c
@@ -98,7 +98,10 @@ tp_errors_disconnected_quark (void)
  * The class of a #TpConnection. In addition to @parent_class there are four
  * pointers reserved for possible future use.
  *
- * Since: 0.7.1; structure layout visible since 0.7.12
+ * (Changed in 0.7.12: the layout of the structure is visible, allowing
+ * subclassing.)
+ *
+ * Since: 0.7.1
  */
 
 /**
@@ -108,7 +111,10 @@ tp_errors_disconnected_quark (void)
  *
  * A proxy object for a Telepathy connection.
  *
- * Since: 0.7.1; structure layout visible since 0.7.12
+ * (Changed in 0.7.12: the layout of the structure is visible, allowing
+ * subclassing.)
+ *
+ * Since: 0.7.1
  */
 
 enum
diff --git a/telepathy-glib/extra-gtkdoc.h b/telepathy-glib/extra-gtkdoc.h
index aacffb4..0dd6523 100644
--- a/telepathy-glib/extra-gtkdoc.h
+++ b/telepathy-glib/extra-gtkdoc.h
@@ -208,8 +208,10 @@
  * This header contains definitions which didn't fit into enums.h,
  * interfaces.h or errors.h.
  *
- * Since: 0.7.0. In older versions, these constants were in base-connection.h
- * and base-connection-manager.h.
+ * Changed in 0.7.0: in older versions, some of these constants were in
+ * base-connection.h and base-connection-manager.h.
+ *
+ * Since: 0.7.0
  */
 
 /**
diff --git a/telepathy-glib/properties-mixin.c b/telepathy-glib/properties-mixin.c
index dde0580..6d6d2b8 100644
--- a/telepathy-glib/properties-mixin.c
+++ b/telepathy-glib/properties-mixin.c
@@ -72,7 +72,7 @@ struct _TpPropertiesMixinPrivate {
     TpPropertiesContext context;
 };
 
-/**
+/*
  * tp_properties_mixin_class_get_offset_quark:
  *
  * Returns: the quark used for storing mixin offset on a GObjectClass
@@ -87,7 +87,7 @@ tp_properties_mixin_class_get_offset_quark ()
   return offset_quark;
 }
 
-/**
+/*
  * tp_properties_mixin_get_offset_quark:
  *
  * Returns: the quark used for storing mixin offset on a GObject
-- 
1.5.6.5