diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-05-25 17:29:35 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-05-31 13:52:39 +0100 |
| commit | b5ee1159b0a10ba187bb1ddb604febe6ebdf0e7e (patch) | |
| tree | dc914dfcc36deb29bf2025f2fb41f33afc7a6bb8 /src | |
| parent | 05f0814132b5fcf2119017dfea72a2c40a3f79ec (diff) | |
| download | telepathy-salut-b5ee1159b0a10ba187bb1ddb604febe6ebdf0e7e.tar.gz | |
muc-manager: remove Tubes channel handling code
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src')
| -rw-r--r-- | src/muc-manager.c | 38 | ||||
| -rw-r--r-- | src/tubes-manager.c | 2 |
2 files changed, 0 insertions, 40 deletions
diff --git a/src/muc-manager.c b/src/muc-manager.c index 5f3f24d4..c502c92d 100644 --- a/src/muc-manager.c +++ b/src/muc-manager.c @@ -841,12 +841,10 @@ salut_muc_manager_request (SalutMucManager *self, gboolean require_new) { SalutMucManagerPrivate *priv = SALUT_MUC_MANAGER_GET_PRIVATE (self); - TpBaseConnection *base_conn = (TpBaseConnection *) priv->connection; GError *error = NULL; TpHandle handle; const gchar *channel_type; SalutMucChannel *text_chan; - SalutTubesChannel *tubes_chan; if (tp_asv_get_uint32 (request_properties, TP_IFACE_CHANNEL ".TargetHandleType", NULL) != TP_HANDLE_TYPE_ROOM) @@ -856,7 +854,6 @@ salut_muc_manager_request (SalutMucManager *self, TP_IFACE_CHANNEL ".ChannelType"); if (tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT) && - tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TUBES) && tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE) && tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE)) return FALSE; @@ -898,41 +895,6 @@ salut_muc_manager_request (SalutMucManager *self, return TRUE; } - else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TUBES)) - { - if (tp_channel_manager_asv_has_unknown_properties (request_properties, - muc_tubes_channel_fixed_properties, - muc_tubes_channel_allowed_properties, - &error)) - goto error; - - tubes_chan = g_hash_table_lookup (priv->tubes_channels, - GUINT_TO_POINTER (handle)); - - if (tubes_chan != NULL) - { - if (require_new) - { - g_set_error (&error, TP_ERROR, TP_ERROR_NOT_AVAILABLE, - "That channel has already been created (or requested)"); - goto error; - } - else - { - tp_channel_manager_emit_request_already_satisfied (self, - request_token, TP_EXPORTABLE_CHANNEL (tubes_chan)); - } - } - else - { - tubes_chan = create_tubes_channel (self, handle, - base_conn->self_handle, request_token, TRUE, NULL, TRUE, &error); - if (tubes_chan == NULL) - goto error; - } - - return TRUE; - } else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE)) { if (handle_stream_tube_channel_request (self, request_token, diff --git a/src/tubes-manager.c b/src/tubes-manager.c index 7a5d02bc..68ab4736 100644 --- a/src/tubes-manager.c +++ b/src/tubes-manager.c @@ -891,8 +891,6 @@ new_channel_from_request (SalutTubesManager *self, handle, handle_type, base_conn->self_handle, base_conn->self_handle, FALSE, service, parameters, tube_id, 0, NULL, TRUE)); - - tube = SALUT_TUBE_IFACE (NULL); } else if (!tp_strdiff (ctype, TP_IFACE_CHANNEL_TYPE_DBUS_TUBE)) { |