Initial Voice+Video support Fixes bug #468204 (Elliot Fairweather, Xavier

2007-09-29  Xavier Claessens  <xclaesse@gmail.com>

	* libempathy-gtk/empathy-call-window.c:
	* libempathy-gtk/empathy-call-window.h:
	* libempathy-gtk/empathy-contact-list-view.c:
	* libempathy-gtk/empathy-call-window.glade:
	* libempathy-gtk/Makefile.am:
	* libempathy-gtk/empathy-chat-window.c:
	* src/empathy-call-chandler.c:
	* src/empathy-call.chandler:
	* src/org.gnome.Empathy.Call.service.in:
	* src/Makefile.am:
	* libempathy/empathy-utils.c:
	* libempathy/empathy-utils.h:
	* libempathy/empathy-tp-call.c:
	* libempathy/empathy-tp-call.h:
	* libempathy/Makefile.am:
	* libempathy/tp-stream-engine.xml:
	* configure.ac:
	* doc/libempathy-gtk/libempathy-gtk-docs.sgml:
	* doc/libempathy/libempathy.types:
	* doc/libempathy/libempathy-docs.sgml:
	* doc/libempathy/Makefile.am:
	* doc/libempathy/tmpl/empathy-utils.sgml: Initial Voice+Video support
	Fixes bug #468204 (Elliot Fairweather, Xavier Claessens).


svn path=/trunk/; revision=339

1 files changed, 1 insertions, 54 deletions

diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c
index c959eec01..1fcbf4440 100644
--- a/libempathy-gtk/empathy-contact-list-view.c
+++ b/libempathy-gtk/empathy-contact-list-view.c
@@ -1438,59 +1438,6 @@ static void
 contact_list_view_voip_activated (EmpathyContactListView *view,
 				  EmpathyContact         *contact)
 {
-	MissionControl *mc;
-	McAccount      *account;
-	TpConn         *tp_conn;
-	gchar          *object_path;
-	const gchar    *bus_name;
-	TpChan         *new_chan;
-	EmpathyTpGroup *group;
-	GError         *error;
-
-	/* 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);
-
-	/* FIXME: group is leaked, we can't unref it directly because
-	 * _add_member is async so we have to wait for it to return before
-	 * finalizing the group. I think EmpathyTpGroup should ref itself
-	 * when it does async calls to avoid finalizing when there is calls
-	 * in fligth like that we could unref it here. */
-	group = empathy_tp_group_new (account, new_chan);
-	empathy_tp_group_add_member (group, contact, "");
-
-	g_object_unref (mc);
-	g_object_unref (tp_conn);
-	g_object_unref (new_chan);
-	g_free (object_path);
+	empathy_call_contact (contact);
 }