summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2012-07-05 15:54:52 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2012-07-05 15:54:52 +0100
commit6b037b43df5104636f58ab0a3e10c075012feee5 (patch)
tree6988732b6c1ab33da7691d141dccd45344b1b30b
parentaaea3147323cd1ad1b67e17c06504a5a6d6517cc (diff)
downloadtelepathy-glib-6b037b43df5104636f58ab0a3e10c075012feee5.tar.gz
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@collabora.co.uk>
-rw-r--r--telepathy-glib/base-connection-manager.c2
-rw-r--r--telepathy-glib/base-connection-manager.h4
-rw-r--r--telepathy-glib/base-connection.c2
-rw-r--r--telepathy-glib/base-connection.h4
4 files changed, 6 insertions, 6 deletions
diff --git a/telepathy-glib/base-connection-manager.c b/telepathy-glib/base-connection-manager.c
index abec982a6..a9562be92 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 9df0db950..5668a5537 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 28b95b01c..9bacd7f8d 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 0e65d840e..9e46b32fe 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;