telepathy-salut: muc-manager: send SI stream requests to the MUC channel, not tubes channel
Jonny Lamb
jonny at kemper.freedesktop.org
Tue Aug 28 06:30:45 PDT 2012
Module: telepathy-salut
Branch: master
Commit: 89c1cb976ac7ef8201391833d372bf4f4861fd7a
URL: http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=89c1cb976ac7ef8201391833d372bf4f4861fd7a
Author: Jonny Lamb <jonny.lamb at collabora.co.uk>
Date: Thu May 31 13:32:26 2012 +0100
muc-manager: send SI stream requests to the MUC channel, not tubes channel
Signed-off-by: Jonny Lamb <jonny.lamb at collabora.co.uk>
---
src/muc-manager.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/muc-manager.c b/src/muc-manager.c
index 3a84780..7272fab 100644
--- a/src/muc-manager.c
+++ b/src/muc-manager.c
@@ -1116,23 +1116,23 @@ salut_muc_manager_handle_si_stream_request (SalutMucManager *self,
SalutMucManagerPrivate *priv = SALUT_MUC_MANAGER_GET_PRIVATE (self);
TpHandleRepoIface *room_repo = tp_base_connection_get_handles (
(TpBaseConnection *) priv->connection, TP_HANDLE_TYPE_ROOM);
- SalutTubesChannel *chan = NULL;
+ SalutMucChannel *chan = NULL;
g_return_if_fail (tp_handle_is_valid (room_repo, room_handle, NULL));
- chan = g_hash_table_lookup (priv->tubes_channels,
+ chan = g_hash_table_lookup (priv->text_channels,
GUINT_TO_POINTER (room_handle));
if (chan == NULL)
{
GError e = { WOCKY_XMPP_ERROR, WOCKY_XMPP_ERROR_BAD_REQUEST,
- "No tubes channel available for this MUC" };
+ "No channel available for this MUC" };
- DEBUG ("tubes channel doesn't exist for muc %d", room_handle);
+ DEBUG ("MUC channel doesn't exist for muc %d", room_handle);
gibber_bytestream_iface_close (bytestream, &e);
return;
}
- salut_tubes_channel_bytestream_offered (chan, bytestream, msg);
+ salut_muc_channel_bytestream_offered (chan, bytestream, msg);
}
/* Caller is reponsible of announcing the channel if created */
More information about the telepathy-commits
mailing list