summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-05-07 14:11:44 +0100
committerXavier Claessens <xavier.claessens@collabora.co.uk>2012-06-04 13:43:10 +0200
commit0952f8d1ab6ec5735fb74243a3adfffbf2b81cd0 (patch)
tree4f6a649f7bd43d2cd09e215e22358bfeb9378eed
parent3a0ec556a6819d2ca1945b1def4dbacb534f0053 (diff)
TpBaseConnection: seal struct fields
-rw-r--r--telepathy-glib/base-connection.c24
-rw-r--r--telepathy-glib/base-connection.h10
2 files changed, 9 insertions, 25 deletions
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c
index ffd7328e4..d5fe296a9 100644
--- a/telepathy-glib/base-connection.c
+++ b/telepathy-glib/base-connection.c
@@ -179,29 +179,13 @@
/**
* TpBaseConnection:
- * @parent: Fields shared by the superclass.
- * @bus_name: A D-Bus well-known bus name, owned by the connection manager
- * process and associated with this connection. Set by
- * tp_base_connection_register; should be considered read-only by subclasses.
- * @object_path: The object-path of this connection. Set by
- * tp_base_connection_register; should be considered read-only by subclasses.
- * @status: Connection status - may either be a valid TpConnectionStatus or
- * TP_INTERNAL_CONNECTION_STATUS_NEW. Should be considered read-only by
- * subclasses: use tp_base_connection_change_status() to set it.
- * @self_handle: The handle of type %TP_HANDLE_TYPE_CONTACT representing the
- * local user. Must be set nonzero by the subclass before moving to state
- * CONNECTED. Since 0.7.15, setting this property directly is
- * deprecated, in favour of tp_base_connection_set_self_handle(); if this
- * property is set directly, the connection must ensure it holds a reference
- * to the handle. Changing this property directly having moved to state
- * CONNECTED is very strongly discouraged, as this will prevent the
- * SelfHandleChanged signal being emitted.
*
* Data structure representing a generic #TpSvcConnection implementation.
*
- * In addition to the fields documented here, there are four gpointer fields
- * which must currently be %NULL (a meaning may be defined for these in a
- * future version of telepathy-glib), and a pointer to opaque private data.
+ * Since 0.UNRELEASED, accessing the fields of this structure is deprecated.
+ * Use tp_base_connection_get_bus_name(), tp_base_connection_get_object_path(),
+ * tp_base_connection_get_status(), tp_base_connection_get_self_handle()
+ * instead.
*/
/**
diff --git a/telepathy-glib/base-connection.h b/telepathy-glib/base-connection.h
index 1078e485c..8ca587778 100644
--- a/telepathy-glib/base-connection.h
+++ b/telepathy-glib/base-connection.h
@@ -57,15 +57,15 @@ typedef gchar *(*TpBaseConnectionGetUniqueConnectionNameImpl) (
TpBaseConnection *self);
struct _TpBaseConnection {
- /*<public>*/
+ /*<private>*/
GObject parent;
- gchar *bus_name;
- gchar *object_path;
+ gchar *_TP_SEAL (bus_name);
+ gchar *_TP_SEAL (object_path);
- TpConnectionStatus status;
+ TpConnectionStatus _TP_SEAL (status);
- TpHandle self_handle;
+ TpHandle _TP_SEAL (self_handle);
/*<private>*/
gpointer _future1;