aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-08-07 22:40:51 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-08-07 22:40:51 +0800
commit4ae459cba54d8a8208ff3cfcfaf04d6447bffe55 (patch)
tree8edcb364244cae1f13be4afdb47b5c3b1e7e9bc0 /libempathy-gtk
parent2ee684990ffc487d7b37e08a7ffa63fd32f8a77a (diff)
downloadgsoc2013-empathy-4ae459cba54d8a8208ff3cfcfaf04d6447bffe55.tar
gsoc2013-empathy-4ae459cba54d8a8208ff3cfcfaf04d6447bffe55.tar.gz
gsoc2013-empathy-4ae459cba54d8a8208ff3cfcfaf04d6447bffe55.tar.bz2
gsoc2013-empathy-4ae459cba54d8a8208ff3cfcfaf04d6447bffe55.tar.lz
gsoc2013-empathy-4ae459cba54d8a8208ff3cfcfaf04d6447bffe55.tar.xz
gsoc2013-empathy-4ae459cba54d8a8208ff3cfcfaf04d6447bffe55.tar.zst
gsoc2013-empathy-4ae459cba54d8a8208ff3cfcfaf04d6447bffe55.zip
Do not use mission_control_request_channel as we don't use MC's dispatcher anymore. Fixes bug #529084.
svn path=/trunk/; revision=1311
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-chat.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index 9de2c79f6..48aa793d5 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -179,13 +179,17 @@ chat_status_changed_cb (MissionControl *mc,
if (status == TP_CONNECTION_STATUS_CONNECTED && !priv->tp_chat &&
empathy_account_equal (account, priv->account) &&
priv->handle_type != TP_HANDLE_TYPE_NONE) {
+ TpConnection *connection;
+
DEBUG ("Account reconnected, request a new Text channel");
- mission_control_request_channel_with_string_handle (mc,
- priv->account,
- TP_IFACE_CHANNEL_TYPE_TEXT,
- priv->id,
- priv->handle_type,
- NULL, NULL);
+ connection = mission_control_get_tpconnection (mc, account, NULL);
+ tp_connection_run_until_ready (connection, FALSE, NULL, NULL);
+ empathy_connection_request_channel (connection, -1,
+ TP_IFACE_CHANNEL_TYPE_TEXT,
+ priv->handle_type,
+ priv->id, TRUE,
+ NULL, NULL, NULL, NULL);
+ g_object_unref (connection);
}
g_object_unref (account);