Merge branch 'master' into tp-tube

[empathy.git] / libempathy / empathy-tp-tube.c

diff --git a/libempathy/empathy-tp-tube.c b/libempathy/empathy-tp-tube.c
index 746708fc424579e18ec940984f15bd3b3a0ca1aa..7d22f6b783cae6d7d16faedb99e8a8246f4b0f9d 100644 (file)
--- a/libempathy/empathy-tp-tube.c
+++ b/libempathy/empathy-tp-tube.c
@@ -390,8 +390,6 @@ empathy_tp_tube_new_stream_tube (EmpathyContact *contact,
                                  const gchar *service,
                                  GHashTable *parameters)
 {
-  MissionControl *mc;
-  McAccount *account;
   TpConnection *connection;
   TpChannel *channel;
   gchar *object_path;
@@ -408,12 +406,7 @@ empathy_tp_tube_new_stream_tube (EmpathyContact *contact,
   g_return_val_if_fail (hostname != NULL, NULL);
   g_return_val_if_fail (service != NULL, NULL);
 
-  mc = empathy_mission_control_dup_singleton ();
-  account = empathy_contact_get_account (contact);
-  connection = mission_control_get_tpconnection (mc, account, NULL);
-  g_object_unref (mc);
-
-  tp_connection_run_until_ready (connection, FALSE, NULL, NULL);
+  connection = empathy_contact_get_connection (contact);
 
   request = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
       (GDestroyNotify) tp_g_value_slice_free);