Change new message dialog to new conversation and make possible to do voip call.

[empathy.git] / libempathy / empathy-utils.c

diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index c810f9cca509d237cc5dfd0cceaaaabbe9d1444e..796d23ddf1675b2b30b64d05d145be97b8d22a6c 100644 (file)
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -397,61 +397,36 @@ empathy_inspect_handle (McAccount *account,
 }
 
 void
-empathy_call_contact (EmpathyContact *contact)
+empathy_call_with_contact (EmpathyContact  *contact)
 {
 #ifdef HAVE_VOIP
        MissionControl *mc;
-       McAccount      *account;
-       TpConn         *tp_conn;
-       gchar          *object_path;
-       const gchar    *bus_name;
-       TpChan         *new_chan;
-       EmpathyTpGroup *group;
-       GError         *error = NULL;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-
-       /* StreamedMedia channels must have handle=0 and handle_type=none.
-        * To call a contact we have to add him in the group interface of the
-        * channel. MissionControl will detect the channel creation and 
-        * dispatch it to the VoIP chandler automatically. */
 
        mc = empathy_mission_control_new ();
-       account = empathy_contact_get_account (contact);
-       tp_conn = mission_control_get_connection (mc, account, NULL);
-       /* FIXME: Should be async */
-       if (!tp_conn_request_channel (DBUS_G_PROXY (tp_conn),
-                                     TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-                                     TP_HANDLE_TYPE_NONE,
-                                     0,
-                                     FALSE,
-                                     &object_path,
-                                     &error)) {
-               empathy_debug (DEBUG_DOMAIN, 
-                             "Couldn't request channel: %s",
-                             error ? error->message : "No error given");
-               g_clear_error (&error);
-               g_object_unref (mc);
-               g_object_unref (tp_conn);
-               return;
-       }
-
-       bus_name = dbus_g_proxy_get_bus_name (DBUS_G_PROXY (tp_conn));
-       new_chan = tp_chan_new (tp_get_bus (),
-                               bus_name,
-                               object_path,
-                               TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-                               TP_HANDLE_TYPE_NONE,
-                               0);
+       mission_control_request_channel (mc,
+                                        empathy_contact_get_account (contact),
+                                        TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
+                                        empathy_contact_get_handle (contact),
+                                        TP_HANDLE_TYPE_CONTACT,
+                                        NULL, NULL);
+       g_object_unref (mc);
+#endif
+}
 
-       group = empathy_tp_group_new (account, new_chan);
-       empathy_tp_group_add_member (group, contact, "");
+void
+empathy_call_with_contact_id (McAccount *account, const gchar *contact_id)
+{
+#ifdef HAVE_VOIP
+       MissionControl *mc;
 
-       g_object_unref (group);
+       mc = empathy_mission_control_new ();
+       mission_control_request_channel_with_string_handle (mc,
+                                                           account,
+                                                           TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
+                                                           contact_id,
+                                                           TP_HANDLE_TYPE_CONTACT,
+                                                           NULL, NULL);
        g_object_unref (mc);
-       g_object_unref (tp_conn);
-       g_object_unref (new_chan);
-       g_free (object_path);
 #endif
 }
 
@@ -485,7 +460,6 @@ empathy_chat_with_contact_id (McAccount *account, const gchar *contact_id)
        g_object_unref (mc);
 }
 
-
 const gchar *
 empathy_presence_get_default_message (McPresence presence)
 {