telepathy-glib: base-connection{, -manager}: seal old interfaces members

[Jonny Lamb]

Module: telepathy-glib
Branch: master
Commit: 6b037b43df5104636f58ab0a3e10c075012feee5
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=6b037b43df5104636f58ab0a3e10c075012feee5

Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date:   Thu Jul  5 15:54:52 2012 +0100

base-connection{,-manager}: seal old interfaces members

gtk-doc gets confused, so they've been removed from the docs. See
also: e8f9a27a388e21

Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>

---

 telepathy-glib/base-connection-manager.c |    2 --
 telepathy-glib/base-connection-manager.h |    4 +++-
 telepathy-glib/base-connection.c         |    2 --
 telepathy-glib/base-connection.h         |    4 +++-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/telepathy-glib/base-connection-manager.c b/telepathy-glib/base-connection-manager.c
index abec982..a9562be 100644
--- a/telepathy-glib/base-connection-manager.c
+++ b/telepathy-glib/base-connection-manager.c
@@ -214,8 +214,6 @@ _tp_legacy_protocol_new (TpBaseConnectionManager *cm,
  *  whose name member is %NULL; or %NULL if this CM uses Protocol objects.
  * @new_connection: A #TpBaseConnectionManagerNewConnFunc used to construct
  *  new connections, or %NULL if this CM uses Protocol objects.
- * @interfaces: deprecated since 0.UNRELEASED; implement @get_interfaces
- *  instead.
  * @get_interfaces: Returns a #GPtrArray of static strings of extra
  *  D-Bus interfaces implemented by instances of this class, which may be
  *  filled in by subclasses. The default is to list no additional interfaces.
diff --git a/telepathy-glib/base-connection-manager.h b/telepathy-glib/base-connection-manager.h
index 9df0db9..5668a55 100644
--- a/telepathy-glib/base-connection-manager.h
+++ b/telepathy-glib/base-connection-manager.h
@@ -73,7 +73,9 @@ struct _TpBaseConnectionManagerClass {
     const TpCMProtocolSpec *_TP_SEAL (protocol_params);
     TpBaseConnectionManagerNewConnFunc _TP_SEAL (new_connection);
 
-    const gchar * const *interfaces;
+    /*<private>*/
+    const gchar * const *_TP_SEAL (interfaces);
+    /*<public>*/
     TpBaseConnectionManagerGetInterfacesFunc get_interfaces;
 
     /*<private>*/
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index 28b95b0..9bacd7f 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -183,8 +183,6 @@
  * @start_connecting: Asynchronously start connecting - called to implement
  *  the Connect D-Bus method. See #TpBaseConnectionStartConnectingImpl for
  *  details. May not be left as %NULL.
- * @interfaces_always_present: deprecated since 0.UNRELEASED: implement
- *  @get_interfaces_always_present instead.
  * @get_interfaces_always_present: Returns a #GPtrArray of extra D-Bus
  *  interfaces which are always implemented by instances of this class,
  *  which may be filled in by subclasses. The default is to list no
diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index 0e65d84..9e46b32 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -106,7 +106,9 @@ struct _TpBaseConnectionClass {
 
     TpBaseConnectionStartConnectingImpl start_connecting;
 
-    const gchar **interfaces_always_present;
+    /*<private>*/
+    const gchar **_TP_SEAL (interfaces_always_present);
+    /*<public>*/
     TpBaseConnectionGetInterfacesImpl get_interfaces_always_present;
 
     TpBaseConnectionCreateChannelManagersImpl create_channel_managers;