From 4ae459cba54d8a8208ff3cfcfaf04d6447bffe55 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Thu, 7 Aug 2008 14:40:51 +0000 Subject: Do not use mission_control_request_channel as we don't use MC's dispatcher anymore. Fixes bug #529084. svn path=/trunk/; revision=1311 --- src/empathy-main-window.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/empathy-main-window.c') diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index dbba3b46b..e41b3f11e 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -722,6 +722,7 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom) { MissionControl *mc; McAccount *account; + TpConnection *connection; const gchar *room; mc = empathy_mission_control_new (); @@ -730,12 +731,14 @@ main_window_favorite_chatroom_join (EmpathyChatroom *chatroom) DEBUG ("Requesting channel for '%s'", room); - mission_control_request_channel_with_string_handle (mc, - account, - TP_IFACE_CHANNEL_TYPE_TEXT, - room, - TP_HANDLE_TYPE_ROOM, - NULL, NULL); + connection = mission_control_get_tpconnection (mc, account, NULL); + tp_connection_run_until_ready (connection, TRUE, NULL, NULL); + empathy_connection_request_channel (connection, -1, + TP_IFACE_CHANNEL_TYPE_TEXT, + TP_HANDLE_TYPE_ROOM, + room, TRUE, + NULL, NULL, NULL, NULL); + g_object_unref (connection); g_object_unref (mc); } -- cgit v1.2.3