diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-08 13:41:38 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-04-10 13:27:11 +0100 |
commit | 6f1e7f8791a9c6ada614b422f96398eb9995a80f (patch) | |
tree | fa24d63bb01a5e250dca2c572d03e2ac5b3f3912 | |
parent | b2a3405b3f0682c0bf226be841654250e3b01ca3 (diff) |
TpBaseConnection:dbus-status, TpBaseConnection:requestable-channel-classes: remove
They are not used in Folks, Empathy, MC or the "big 5" CMs, except for one
use of dbus-status in helper code for Folks' regression tests (which will
disappear when resynced from telepathy-glib).
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77187
Reviewed-by: Xavier Claessens
-rw-r--r-- | telepathy-glib/base-connection.c | 45 |
1 files changed, 1 insertions, 44 deletions
diff --git a/telepathy-glib/base-connection.c b/telepathy-glib/base-connection.c index afe7324df..4d8c716c7 100644 --- a/telepathy-glib/base-connection.c +++ b/telepathy-glib/base-connection.c @@ -276,8 +276,6 @@ enum PROP_SELF_HANDLE, PROP_SELF_ID, PROP_INTERFACES, - PROP_REQUESTABLE_CHANNEL_CLASSES, - PROP_DBUS_STATUS, PROP_DBUS_CONNECTION, PROP_ACCOUNT_PATH_SUFFIX, N_PROPS @@ -412,14 +410,6 @@ tp_base_connection_get_property (GObject *object, g_value_set_boxed (value, tp_base_connection_get_interfaces (self)); break; - case PROP_REQUESTABLE_CHANNEL_CLASSES: - g_value_take_boxed (value, conn_requests_get_requestables (self)); - break; - - case PROP_DBUS_STATUS: - g_value_set_uint (value, tp_base_connection_get_status (self)); - break; - case PROP_DBUS_CONNECTION: g_value_set_object (value, self->priv->dbus_connection); break; @@ -1156,39 +1146,6 @@ tp_base_connection_class_init (TpBaseConnectionClass *klass) g_object_class_install_property (object_class, PROP_INTERFACES, param_spec); /** - * TpBaseConnection:requestable-channel-classes: (skip) - * - * The classes of channel that are expected to be available on this connection - */ - param_spec = g_param_spec_boxed ("requestable-channel-classes", - "Connection.RequestableChannelClasses", - "Connection.RequestableChannelClasses", - TP_ARRAY_TYPE_REQUESTABLE_CHANNEL_CLASS_LIST, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - g_object_class_install_property (object_class, - PROP_REQUESTABLE_CHANNEL_CLASSES, param_spec); - - /** - * TpBaseConnection:dbus-status: (skip) - * - * The Connection.Status as visible on D-Bus, which is the same as - * #TpBaseConnection<!-- -->.status except that - * %TP_INTERNAL_CONNECTION_STATUS_NEW is replaced by - * %TP_CONNECTION_STATUS_DISCONNECTED. - * - * The #GObject::notify signal is not currently emitted for this property. - * - * Since: 0.11.3 - */ - param_spec = g_param_spec_uint ("dbus-status", - "Connection.Status", - "The connection status as visible on D-Bus", - TP_CONNECTION_STATUS_CONNECTED, TP_CONNECTION_STATUS_DISCONNECTED, - TP_CONNECTION_STATUS_DISCONNECTED, - G_PARAM_READABLE | G_PARAM_STATIC_STRINGS); - g_object_class_install_property (object_class, PROP_DBUS_STATUS, param_spec); - - /** * TpBaseConnection:dbus-connection: * * This object's connection to D-Bus. Read-only except during construction. @@ -1612,7 +1569,7 @@ tp_base_connection_get_interfaces (TpBaseConnection *self) * a failed attempt to connect, or loss of an established connection). * Use tp_base_connection_is_destroyed() to distinguish between the two. * - * Returns: the value of #TpBaseConnection:dbus-status + * Returns: the connection's status * Since: 0.19.1 */ TpConnectionStatus |