Merge call branch from Elliot Fairweather with cleanups from Xavier Claessens.

svn path=/trunk/; revision=632

3 files changed, 891 insertions, 582 deletions

diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index 3e8467994..1e2473e14 100644
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -1,44 +1,45 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2007 Elliot Fairweather
- * Copyright (C) 2007 Collabora Ltd.
+ *  Copyright (C) 2007 Elliot Fairweather
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * Authors: Elliot Fairweather <elliot.fairweather@collabora.co.uk>
- *          Xavier Claessens <xclaesse@gmail.com>
+ *  Authors: Elliot Fairweather <elliot.fairweather@collabora.co.uk>
  */
 
-#include "config.h"
+#include <string.h>
+#include <dbus/dbus-glib.h>
 
 #include <libtelepathy/tp-chan-type-streamed-media-gen.h>
+#include <libtelepathy/tp-connmgr.h>
 #include <libtelepathy/tp-helpers.h>
-#include <libtelepathy/tp-conn.h>
 
-#include <libmissioncontrol/mission-control.h>
+#include <libmissioncontrol/mc-account.h>
+
+#include <libempathy/empathy-contact-factory.h>
+#include <libempathy/empathy-debug.h>
+#include <libempathy/empathy-tp-group.h>
+#include <libempathy/empathy-utils.h>
 
-#include "empathy-tp-call.h"
-#include "empathy-tp-group.h"
-#include "empathy-utils.h"
-#include "empathy-debug.h"
-#include "empathy-enum-types.h"
 #include "tp-stream-engine-gen.h"
 
+#include "empathy-tp-call.h"
+
 #define DEBUG_DOMAIN "TpCall"
 
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_TP_CALL, EmpathyTpCallPriv))
+#define GET_PRIV(object) (G_TYPE_INSTANCE_GET_PRIVATE \
+    ((object), EMPATHY_TYPE_TP_CALL, EmpathyTpCallPriv))
 
 #define STREAM_ENGINE_BUS_NAME "org.freedesktop.Telepathy.StreamEngine"
 #define STREAM_ENGINE_OBJECT_PATH "/org/freedesktop/Telepathy/StreamEngine"
@@ -47,33 +48,37 @@
 
 typedef struct _EmpathyTpCallPriv EmpathyTpCallPriv;
 
-struct _EmpathyTpCallPriv {
-	TpChan              *tp_chan;
-	DBusGProxy          *streamed_iface;
-	DBusGProxy          *se_ch_proxy;
-	DBusGProxy          *se_proxy;
-	McAccount           *account;
-	EmpathyTpGroup      *group;
-  	EmpathyContact      *contact;
-	EmpathyTpCallStatus  status;
-	gboolean             is_incoming;
-	guint                audio_stream;
-	guint                video_stream;
+struct _EmpathyTpCallPriv
+{
+  TpConn *connection;
+  TpChan *channel;
+  EmpathyTpGroup *group;
+  EmpathyContact *contact;
+  gboolean is_incoming;
+  guint status;
+
+  EmpathyTpCallStream *audio;
+  EmpathyTpCallStream *video;
 };
 
-static void empathy_tp_call_class_init (EmpathyTpCallClass *klass);
-static void empathy_tp_call_init       (EmpathyTpCall      *call);
-
-enum {
-	PROP_0,
-	PROP_ACCOUNT,
-	PROP_TP_CHAN,
-	PROP_STATUS
+enum
+{
+  STATUS_CHANGED_SIGNAL,
+  RECEIVING_VIDEO_SIGNAL,
+  SENDING_VIDEO_SIGNAL,
+  LAST_SIGNAL
 };
 
-enum {
-	DESTROY,
-	LAST_SIGNAL
+enum
+{
+  PROP_0,
+  PROP_CONNECTION,
+  PROP_CHANNEL,
+  PROP_CONTACT,
+  PROP_IS_INCOMING,
+  PROP_STATUS,
+  PROP_AUDIO_STREAM,
+  PROP_VIDEO_STREAM
 };
 
 static guint signals[LAST_SIGNAL];
@@ -81,575 +86,836 @@ static guint signals[LAST_SIGNAL];
 G_DEFINE_TYPE (EmpathyTpCall, empathy_tp_call, G_TYPE_OBJECT)
 
 static void
-tp_call_set_status (EmpathyTpCall       *call,
-		    EmpathyTpCallStatus  status)
+tp_call_stream_state_changed_cb (DBusGProxy *channel,
+                                 guint stream_id,
+                                 guint stream_state,
+                                 EmpathyTpCall *call)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-
-	priv->status = status;
-	g_object_notify (G_OBJECT (call), "status");
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+  empathy_debug (DEBUG_DOMAIN,
+      "Stream state changed - stream id: %d, state state: %d",
+      stream_id, stream_state);
+
+  if (stream_id == priv->audio->id)
+    {
+      priv->audio->state = stream_state;
+    }
+  else if (stream_id == priv->video->id)
+    {
+      priv->video->state = stream_state;
+    }
+
+  g_signal_emit_by_name (call, "status-changed");
 }
 
 static void
-tp_call_set_property (GObject      *object,
-		      guint         prop_id,
-		      const GValue *value,
-		      GParamSpec   *pspec)
-{
-	EmpathyTpCallPriv *priv = GET_PRIV (object);
-
-	switch (prop_id) {
-	case PROP_ACCOUNT:
-        	priv->account = g_object_ref (g_value_get_object (value));
-		break;
-	case PROP_TP_CHAN:
-        	priv->tp_chan = g_object_ref (g_value_get_object (value));
-		break;
-	case PROP_STATUS:
-		tp_call_set_status (EMPATHY_TP_CALL (object),
-				    g_value_get_enum (value));
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+tp_call_identify_streams (EmpathyTpCall *call)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  GPtrArray *stream_infos;
+  DBusGProxy *streamed_iface;
+  GError *error = NULL;
+  guint i;
+
+  empathy_debug (DEBUG_DOMAIN, "Identifying audio/video streams");
+
+  streamed_iface = tp_chan_get_interface (priv->channel,
+      TELEPATHY_CHAN_IFACE_STREAMED_QUARK);
+
+  if (!tp_chan_type_streamed_media_list_streams (streamed_iface, &stream_infos,
+        &error))
+    {
+      empathy_debug (DEBUG_DOMAIN, "Couldn't list audio/video streams: %s",
+          error->message);
+      g_clear_error (&error);
+    }
+
+  for (i = 0; i < stream_infos->len; i++)
+    {
+      GValueArray *values;
+      guint stream_id;
+      guint stream_handle;
+      guint stream_type;
+      guint stream_state;
+      guint stream_direction;
+
+      values = g_ptr_array_index (stream_infos, i);
+      stream_id = g_value_get_uint (g_value_array_get_nth (values, 0));
+      stream_handle = g_value_get_uint (g_value_array_get_nth (values, 1));
+      stream_type = g_value_get_uint (g_value_array_get_nth (values, 2));
+      stream_state = g_value_get_uint (g_value_array_get_nth (values, 3));
+      stream_direction = g_value_get_uint (g_value_array_get_nth (values, 4));
+
+      switch (stream_type)
+        {
+        case TP_MEDIA_STREAM_TYPE_AUDIO:
+          empathy_debug (DEBUG_DOMAIN,
+              "Audio stream - id: %d, state: %d, direction: %d",
+              stream_id, stream_state, stream_direction);
+          priv->audio->exists = TRUE;
+          priv->audio->id = stream_id;
+          priv->audio->state = stream_state;
+          priv->audio->direction = stream_direction;
+          break;
+        case TP_MEDIA_STREAM_TYPE_VIDEO:
+          empathy_debug (DEBUG_DOMAIN,
+              "Video stream - id: %d, state: %d, direction: %d",
+              stream_id, stream_state, stream_direction);
+          priv->video->exists = TRUE;
+          priv->video->id = stream_id;
+          priv->video->state = stream_state;
+          priv->video->direction = stream_direction;
+          break;
+        default:
+          empathy_debug (DEBUG_DOMAIN, "Unknown stream type: %d",
+              stream_type);
+        }
+
+      g_value_array_free (values);
+    }
 }
 
 static void
-tp_call_get_property (GObject    *object,
-		      guint       prop_id,
-		      GValue     *value,
-		      GParamSpec *pspec)
+tp_call_stream_added_cb (DBusGProxy *channel,
+                         guint stream_id,
+                         guint contact_handle,
+                         guint stream_type,
+                         EmpathyTpCall *call)
 {
-  EmpathyTpCallPriv *priv = GET_PRIV (object);
+  empathy_debug (DEBUG_DOMAIN,
+      "Stream added - stream id: %d, contact handle: %d, stream type: %d",
+      stream_id, contact_handle, stream_type);
 
-	switch (prop_id) {
-	case PROP_ACCOUNT:
-        	g_value_set_object (value, priv->account);
-		break;
-	case PROP_TP_CHAN:
-        	g_value_set_object (value, priv->tp_chan);
-		break;
-	case PROP_STATUS:
-		g_value_set_enum (value, priv->status);
-		break;
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-		break;
-	}
+  tp_call_identify_streams (call);
 }
 
+
 static void
-tp_call_destroy_cb (TpChan        *call_chan,
-		    EmpathyTpCall *call)
+tp_call_stream_removed_cb (DBusGProxy *channel,
+                           guint stream_id,
+                           EmpathyTpCall *call)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-
-	empathy_debug (DEBUG_DOMAIN, "Channel Closed or CM crashed");
-
-	g_object_unref  (priv->tp_chan);
-	priv->tp_chan = NULL;
-	priv->streamed_iface = NULL;
-
-	g_signal_emit (call, signals[DESTROY], 0);
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+  empathy_debug (DEBUG_DOMAIN, "Stream removed - stream id: %d", stream_id);
+
+  if (stream_id == priv->audio->id)
+    {
+      priv->audio->exists = FALSE;
+    }
+  else if (stream_id == priv->video->id)
+    {
+      priv->video->exists = FALSE;
+    }
 }
 
 static void
-tp_call_closed_cb (TpChan        *call_chan,
-		   EmpathyTpCall *call)
+tp_call_channel_closed_cb (TpChan *channel,
+                           EmpathyTpCall *call)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-
-	/* The channel is closed, do just like if the proxy was destroyed */
-	g_signal_handlers_disconnect_by_func (priv->tp_chan,
-					      tp_call_destroy_cb,
-					      call);
-	tp_call_destroy_cb (call_chan, call);
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  DBusGProxy *streamed_iface;
+  DBusGProxy *group_iface;
+
+  empathy_debug (DEBUG_DOMAIN, "Channel closed");
+
+  priv->status = EMPATHY_TP_CALL_STATUS_CLOSED;
+  g_signal_emit_by_name (call, "status-changed");
+
+  streamed_iface = tp_chan_get_interface (priv->channel,
+      TELEPATHY_CHAN_IFACE_STREAMED_QUARK);
+  group_iface = tp_chan_get_interface (priv->channel,
+      TELEPATHY_CHAN_IFACE_GROUP_QUARK);
+
+  dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->channel), "Closed",
+      G_CALLBACK (tp_call_channel_closed_cb), (gpointer) call);
+  dbus_g_proxy_disconnect_signal (streamed_iface, "StreamStateChanged",
+      G_CALLBACK (tp_call_stream_state_changed_cb), (gpointer) call);
+  dbus_g_proxy_disconnect_signal (streamed_iface, "StreamAdded",
+      G_CALLBACK (tp_call_stream_added_cb), (gpointer) call);
+  dbus_g_proxy_disconnect_signal (streamed_iface, "StreamRemoved",
+      G_CALLBACK (tp_call_stream_removed_cb), (gpointer) call);
 }
 
 static void
-tp_call_stream_added_cb (DBusGProxy    *streamed_iface,
-			 guint          stream_id,
-			 guint          contact_handle,
-			 guint          stream_type,
-			 EmpathyTpCall *call)
-{
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-
-	empathy_debug (DEBUG_DOMAIN, "Stream added: id=%d, stream_type=%d",
-		       stream_id, stream_type);
-
-	switch (stream_type) {
-	case TP_MEDIA_STREAM_TYPE_AUDIO:
-		priv->audio_stream = stream_id;
-		break;
-	case TP_MEDIA_STREAM_TYPE_VIDEO:
-		priv->video_stream = stream_id;
-		break;
-	default:
-		empathy_debug (DEBUG_DOMAIN, "Unknown stream type: %d", stream_type);
-	}
+tp_call_stream_direction_changed_cb (DBusGProxy *channel,
+                                     guint stream_id,
+                                     guint stream_direction,
+                                     guint flags,
+                                     EmpathyTpCall *call)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+  empathy_debug (DEBUG_DOMAIN,
+      "Stream direction changed - stream: %d, direction: %d",
+      stream_id, stream_direction);
+
+  if (stream_id == priv->audio->id)
+    {
+      priv->audio->direction = stream_direction;
+    }
+  else if (stream_id == priv->video->id)
+    {
+      priv->video->direction = stream_direction;
+
+      if (stream_direction & TP_MEDIA_STREAM_DIRECTION_RECEIVE)
+        {
+          empathy_debug (DEBUG_DOMAIN, "RECEIVING");
+          g_signal_emit_by_name (call, "receiving-video", TRUE);
+        }
+      else
+        {
+          empathy_debug (DEBUG_DOMAIN, "NOT RECEIVING");
+          g_signal_emit_by_name (call, "receiving-video", FALSE);
+        }
+
+      if (stream_direction & TP_MEDIA_STREAM_DIRECTION_SEND)
+        {
+          empathy_debug (DEBUG_DOMAIN, "SENDING");
+          g_signal_emit_by_name (call, "sending-video", TRUE);
+        }
+      else
+        {
+          empathy_debug (DEBUG_DOMAIN, "NOT SENDING");
+          g_signal_emit_by_name (call, "sending-video", FALSE);
+        }
+    }
 }
 
+static void
+tp_call_request_streams_for_capabilities (EmpathyTpCall *call,
+                                          EmpathyCapabilities capabilities)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  DBusGProxy *streamed_iface;
+  GArray *stream_types;
+  guint handle;
+  guint stream_type;
+  GError *error = NULL;
+
+  empathy_debug (DEBUG_DOMAIN, "Requesting new stream for capabilities %d",
+      capabilities);
+
+  streamed_iface = tp_chan_get_interface (priv->channel,
+      TELEPATHY_CHAN_IFACE_STREAMED_QUARK);
+  stream_types = g_array_new (FALSE, FALSE, sizeof (guint));
+  handle = empathy_contact_get_handle (priv->contact);
+
+  if (capabilities & EMPATHY_CAPABILITIES_AUDIO)
+    {
+      stream_type = TP_MEDIA_STREAM_TYPE_AUDIO;
+      g_array_append_val (stream_types, stream_type);
+    }
+  if (capabilities & EMPATHY_CAPABILITIES_VIDEO)
+    {
+      stream_type = TP_MEDIA_STREAM_TYPE_VIDEO;
+      g_array_append_val (stream_types, stream_type);
+    }
+
+  if (!tp_chan_type_streamed_media_request_streams (streamed_iface, handle,
+        stream_types, NULL, &error))
+    {
+      empathy_debug (DEBUG_DOMAIN, "Couldn't request new stream: %s",
+          error->message);
+      g_clear_error (&error);
+    }
+
+  g_array_free (stream_types, TRUE);
+}
 
 static void
-tp_call_stream_removed_cb (DBusGProxy    *streamed_iface,
-			   guint          stream_id,
-			   EmpathyTpCall *call)
+tp_call_request_streams (EmpathyTpCall *call)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  EmpathyCapabilities capabilities;
+  DBusGProxy *capabilities_iface;
+
+  empathy_debug (DEBUG_DOMAIN,
+      "Requesting appropriate audio/video streams from contact");
+
+  capabilities = empathy_contact_get_capabilities (priv->contact);
 
-	empathy_debug (DEBUG_DOMAIN, "Stream removed: %d", stream_id);
+  /* FIXME: SIP don't have capabilities interface but we know it supports
+   *        only audio and not video. */
+  capabilities_iface = tp_conn_get_interface (priv->connection,
+      TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES);
+  if (!capabilities_iface)
+    {
+      capabilities = EMPATHY_CAPABILITIES_AUDIO;
+    }
 
-	if (stream_id == priv->audio_stream) {
-		priv->audio_stream = 0;
-	}
-	else if (stream_id == priv->video_stream) {
-		priv->video_stream = 0;
-	}
+  tp_call_request_streams_for_capabilities (call, capabilities);
 }
 
 static void
-tp_call_list_streams_cb (DBusGProxy *proxy,
-			 GPtrArray  *streams,
-			 GError     *error,
-			 gpointer    user_data)
-{
-	guint i;
-
-	if (error) {
-		empathy_debug (DEBUG_DOMAIN, "Failed to list streams: %s",
-			       error->message);
-		return;
-	}
-
-	for (i = 0; i < streams->len; i++) {
-		GValueArray *values;
-		guint        stream_id;
-		guint        contact_handle;
-		guint        stream_type;
-
-		values = g_ptr_array_index (streams, i);
-		stream_id = g_value_get_uint (g_value_array_get_nth (values, 0));
-		contact_handle = g_value_get_uint (g_value_array_get_nth (values, 1));
-		stream_type = g_value_get_uint (g_value_array_get_nth (values, 2));
-
-		tp_call_stream_added_cb (proxy,
-					 stream_id,
-					 contact_handle,
-					 stream_type,
-					 user_data);
-	}
+tp_call_is_ready (EmpathyTpCall *call)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  EmpathyContact *self_contact;
+  GList *members;
+  GList *local_pendings;
+  GList *remote_pendings;
+
+  if (priv->status > EMPATHY_TP_CALL_STATUS_READYING)
+    return;
+
+  members = empathy_tp_group_get_members (priv->group);
+  if (!members)
+    return;
+
+  self_contact = empathy_tp_group_get_self_contact (priv->group);
+  local_pendings = empathy_tp_group_get_local_pendings (priv->group);
+  remote_pendings = empathy_tp_group_get_remote_pendings (priv->group);
+
+  if (local_pendings &&
+      empathy_contact_equal (EMPATHY_CONTACT (((EmpathyPendingInfo *)
+            local_pendings->data)->member), self_contact))
+    {
+      empathy_debug (DEBUG_DOMAIN,
+          "Incoming call is ready - %p",
+          ((EmpathyPendingInfo *) local_pendings->data)->member);
+      priv->is_incoming = TRUE;
+      priv->contact = g_object_ref (members->data);
+    }
+  else if (remote_pendings &&
+      empathy_contact_equal (EMPATHY_CONTACT (members->data), self_contact))
+    {
+      empathy_debug (DEBUG_DOMAIN,
+          "Outgoing call is ready - %p", remote_pendings->data);
+      priv->is_incoming = FALSE;
+      priv->contact = g_object_ref (remote_pendings->data);
+      tp_call_request_streams (call);
+    }
+
+  g_object_unref (self_contact);
+  g_list_foreach (members, (GFunc) g_object_unref, NULL);
+  g_list_free (members);
+  g_list_foreach (local_pendings, (GFunc) empathy_pending_info_free, NULL);
+  g_list_free (local_pendings);
+  g_list_foreach (remote_pendings, (GFunc) g_object_unref, NULL);
+  g_list_free (remote_pendings);
+
+  if (priv->contact)
+    {
+      priv->status = EMPATHY_TP_CALL_STATUS_PENDING;
+      g_signal_emit (call, signals[STATUS_CHANGED_SIGNAL], 0);
+    }
 }
 
 static void
 tp_call_member_added_cb (EmpathyTpGroup *group,
-			 EmpathyContact *contact,
-			 EmpathyContact *actor,
-			 guint           reason,
-			 const gchar    *message,
-			 EmpathyTpCall  *call)
-{
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-
-	empathy_debug (DEBUG_DOMAIN, "Members added %s (%d)",
-		       empathy_contact_get_id (contact),
-		       empathy_contact_get_handle (contact));
-
-	if (!priv->contact) {
-		if (!empathy_contact_is_user (contact)) {
-			priv->is_incoming = TRUE;
-			priv->contact = g_object_ref (contact);
-			tp_call_set_status (call, EMPATHY_TP_CALL_STATUS_RINGING);
-		}
-		return;
-	}
-
-	/* We already have the other contact, that means we now have 2 members,
-	 * so we can start the call */
-	tp_call_set_status (call, EMPATHY_TP_CALL_STATUS_RUNNING);
+                         EmpathyContact *contact,
+                         EmpathyContact *actor,
+                         guint reason,
+                         const gchar *message,
+                         EmpathyTpCall *call)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+  empathy_debug (DEBUG_DOMAIN, "New member added callback %p", contact);
+  tp_call_is_ready (call);
+
+  if (priv->status == EMPATHY_TP_CALL_STATUS_PENDING)
+    {
+      if ((priv->is_incoming &&
+            !empathy_contact_equal (contact, priv->contact))
+          || (!priv->is_incoming &&
+            empathy_contact_equal (contact, priv->contact)))
+        {
+          priv->status = EMPATHY_TP_CALL_STATUS_ACCEPTED;
+          g_signal_emit (call, signals[STATUS_CHANGED_SIGNAL], 0);
+        }
+    }
+}
+
+static void
+tp_call_local_pending_cb (EmpathyTpGroup *group,
+                          EmpathyContact *contact,
+                          EmpathyContact *actor,
+                          guint reason,
+                          const gchar *message,
+                          EmpathyTpCall *call)
+{
+  empathy_debug (DEBUG_DOMAIN, "New local pending added callback %p", contact);
+  tp_call_is_ready (call);
 }
 
 static void
 tp_call_remote_pending_cb (EmpathyTpGroup *group,
-			   EmpathyContact *contact,
-			   EmpathyContact *actor,
-			   guint           reason,
-			   const gchar    *message,
-			   EmpathyTpCall  *call)
-{
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-
-	empathy_debug (DEBUG_DOMAIN, "Remote pending: %s (%d)",
-		       empathy_contact_get_id (contact),
-		       empathy_contact_get_handle (contact));
-
-	if (!priv->contact) {
-		priv->is_incoming = FALSE;
-		priv->contact = g_object_ref (contact);
-		tp_call_set_status (call, EMPATHY_TP_CALL_STATUS_RINGING);
-	}
+                           EmpathyContact *contact,
+                           EmpathyContact *actor,
+                           guint reason,
+                           const gchar *message,
+                           EmpathyTpCall *call)
+{
+  empathy_debug (DEBUG_DOMAIN, "New remote pending added callback %p", contact);
+  tp_call_is_ready (call);
 }
 
 static void
-tp_call_async_cb (DBusGProxy *proxy,
-		  GError     *error,
-		  gpointer    user_data)
-{
-	if (error) {
-		empathy_debug (DEBUG_DOMAIN, "Failed to %s: %s",
-			       user_data,
-			       error->message);
-	}
+tp_call_start_stream_engine (EmpathyTpCall *call)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  DBusGProxy *ch_proxy;
+  GError *error = NULL;
+
+  empathy_debug (DEBUG_DOMAIN, "Revving up the stream engine");
+
+  ch_proxy = dbus_g_proxy_new_for_name (tp_get_bus (), STREAM_ENGINE_BUS_NAME,
+      STREAM_ENGINE_OBJECT_PATH, CHANNEL_HANDLER_INTERFACE);
+
+  if (!org_freedesktop_Telepathy_ChannelHandler_handle_channel (ch_proxy,
+        dbus_g_proxy_get_bus_name (DBUS_G_PROXY (priv->connection)),
+        dbus_g_proxy_get_path (DBUS_G_PROXY (priv->connection)),
+        priv->channel->type,
+        dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel)),
+        priv->channel->handle_type, priv->channel->handle, &error))
+    {
+      empathy_debug (DEBUG_DOMAIN, "Couldn't start stream engine: %s",
+          error->message);
+      g_clear_error (&error);
+    }
 }
 
 static GObject *
-tp_call_constructor (GType                  type,
-		     guint                  n_props,
-		     GObjectConstructParam *props)
-{
-	GObject           *call;
-	EmpathyTpCallPriv *priv;
-	TpConn            *tp_conn;
-	MissionControl    *mc;
-
-	call = G_OBJECT_CLASS (empathy_tp_call_parent_class)->constructor (type, n_props, props);
-	priv = GET_PRIV (call);
-
-	priv->group = empathy_tp_group_new (priv->account, priv->tp_chan);
-	priv->streamed_iface = tp_chan_get_interface (priv->tp_chan,
-						      TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA);
-
-	/* Connect signals */
-	dbus_g_proxy_connect_signal (priv->streamed_iface, "StreamAdded",
-				     G_CALLBACK (tp_call_stream_added_cb),
-				     call, NULL);
-	dbus_g_proxy_connect_signal (priv->streamed_iface, "StreamRemoved",
-				     G_CALLBACK (tp_call_stream_removed_cb), 
-				     call, NULL);
-	dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->tp_chan), "Closed",
-				     G_CALLBACK (tp_call_closed_cb),
-				     call, NULL);
-	g_signal_connect (priv->tp_chan, "destroy",
-			  G_CALLBACK (tp_call_destroy_cb),
-			  call);
-	g_signal_connect (priv->group, "member-added",
-			  G_CALLBACK (tp_call_member_added_cb),
-			  call);
-	g_signal_connect (priv->group, "remote-pending",
-			  G_CALLBACK (tp_call_remote_pending_cb),
-			  call);
-
-	/* Start stream engine */
-	mc = empathy_mission_control_new ();
-	tp_conn = mission_control_get_connection (mc, priv->account, NULL);
-	priv->se_ch_proxy = dbus_g_proxy_new_for_name (tp_get_bus (),
-						       STREAM_ENGINE_BUS_NAME,
-						       STREAM_ENGINE_OBJECT_PATH,
-						       CHANNEL_HANDLER_INTERFACE);
-	priv->se_proxy = dbus_g_proxy_new_for_name (tp_get_bus (),
-						    STREAM_ENGINE_BUS_NAME,
-						    STREAM_ENGINE_OBJECT_PATH,
-						    STREAM_ENGINE_INTERFACE);
-	org_freedesktop_Telepathy_ChannelHandler_handle_channel_async (priv->se_ch_proxy,
-		dbus_g_proxy_get_bus_name (DBUS_G_PROXY (tp_conn)),
-		dbus_g_proxy_get_path (DBUS_G_PROXY (tp_conn)),
-		priv->tp_chan->type,
-		dbus_g_proxy_get_path (DBUS_G_PROXY (priv->tp_chan)),
-		priv->tp_chan->handle_type,
-		priv->tp_chan->handle,
-		tp_call_async_cb,
-		"handle channel");
-	g_object_unref (tp_conn);
-	g_object_unref (mc);
-
-	/* Get streams */
-	tp_chan_type_streamed_media_list_streams_async (priv->streamed_iface,
-							tp_call_list_streams_cb,
-							call);
-
-	return call;
+tp_call_constructor (GType type,
+                     guint n_construct_params,
+                     GObjectConstructParam *construct_params)
+{
+  GObject *object;
+  EmpathyTpCall *call;
+  EmpathyTpCallPriv *priv;
+  DBusGProxy *streamed_iface;
+  MissionControl *mc;
+  McAccount *account;
+
+  object = G_OBJECT_CLASS (empathy_tp_call_parent_class)->constructor (type,
+      n_construct_params, construct_params);
+
+  call = EMPATHY_TP_CALL (object);
+  priv = GET_PRIV (call);
+
+  dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->channel), "Closed",
+     G_CALLBACK (tp_call_channel_closed_cb), (gpointer) call, NULL);
+
+  streamed_iface = tp_chan_get_interface (priv->channel,
+      TELEPATHY_CHAN_IFACE_STREAMED_QUARK);
+  dbus_g_proxy_connect_signal (streamed_iface, "StreamStateChanged",
+      G_CALLBACK (tp_call_stream_state_changed_cb),
+      (gpointer) call, NULL);
+  dbus_g_proxy_connect_signal (streamed_iface, "StreamDirectionChanged",
+      G_CALLBACK (tp_call_stream_direction_changed_cb),
+      (gpointer) call, NULL);
+  dbus_g_proxy_connect_signal (streamed_iface, "StreamAdded",
+      G_CALLBACK (tp_call_stream_added_cb), (gpointer) call, NULL);
+  dbus_g_proxy_connect_signal (streamed_iface, "StreamRemoved",
+      G_CALLBACK (tp_call_stream_removed_cb), (gpointer) call, NULL);
+
+  mc = empathy_mission_control_new ();
+  account = mission_control_get_account_for_connection (mc, priv->connection,
+      NULL);
+  priv->group = empathy_tp_group_new (account, priv->channel);
+
+  g_signal_connect (G_OBJECT (priv->group), "member-added",
+      G_CALLBACK (tp_call_member_added_cb), (gpointer) call);
+  g_signal_connect (G_OBJECT (priv->group), "local-pending",
+      G_CALLBACK (tp_call_local_pending_cb), (gpointer) call);
+  g_signal_connect (G_OBJECT (priv->group), "remote-pending",
+      G_CALLBACK (tp_call_remote_pending_cb), (gpointer) call);
+
+  tp_call_start_stream_engine (call);
+  /* FIXME: unnecessary for outgoing? */
+  tp_call_identify_streams (call);
+
+  return object;
 }
 
-static void
+static void 
 tp_call_finalize (GObject *object)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (object);
-
-	empathy_debug (DEBUG_DOMAIN, "Finalizing: %p", object);
-
-	if (priv->tp_chan) {
-		GError *error = NULL;
-
-		g_signal_handlers_disconnect_by_func (priv->tp_chan,
-						      tp_call_destroy_cb,
-						      object);
-		empathy_debug (DEBUG_DOMAIN, "Closing channel...");
-		if (!tp_chan_close (DBUS_G_PROXY (priv->tp_chan), &error)) {
-			empathy_debug (DEBUG_DOMAIN, 
-				      "Error closing text channel: %s",
-				      error ? error->message : "No error given");
-			g_clear_error (&error);
-		}
-		g_object_unref (priv->tp_chan);
-	}
-
-	g_object_unref (priv->group);
-	g_object_unref (priv->contact);
-	g_object_unref (priv->account);
-	g_object_unref (priv->se_ch_proxy);
-	g_object_unref (priv->se_proxy);
-
-	G_OBJECT_CLASS (empathy_tp_call_parent_class)->finalize (object);
+  EmpathyTpCallPriv *priv = GET_PRIV (object);
+
+  empathy_debug (DEBUG_DOMAIN, "Finalizing: %p", object);
+
+  g_slice_free (EmpathyTpCallStream, priv->audio);
+  g_slice_free (EmpathyTpCallStream, priv->video);
+  g_object_unref (priv->group);
+  if (priv->contact)
+    {
+      g_object_unref (priv->contact);
+    }
+
+  (G_OBJECT_CLASS (empathy_tp_call_parent_class)->finalize) (object);
+}
+
+static void 
+tp_call_set_property (GObject *object,
+                      guint prop_id,
+                      const GValue *value,
+                      GParamSpec *pspec)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (object);
+
+  switch (prop_id)
+    {
+    case PROP_CONNECTION:
+      priv->connection = g_value_get_object (value);
+      break;
+    case PROP_CHANNEL:
+      priv->channel = g_value_get_object (value);
+      break;
+    case PROP_CONTACT:
+      priv->contact = g_value_get_object (value);
+      break;
+    case PROP_IS_INCOMING:
+      priv->is_incoming = g_value_get_boolean (value);
+      break;
+    case PROP_STATUS:
+      priv->status = g_value_get_uint (value);
+      break;
+    case PROP_AUDIO_STREAM:
+      priv->audio = g_value_get_pointer (value);
+      break;
+    case PROP_VIDEO_STREAM:
+      priv->video = g_value_get_pointer (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+
+static void
+tp_call_get_property (GObject *object,
+                      guint prop_id,
+                      GValue *value,
+                      GParamSpec *pspec)
+{
+  EmpathyTpCallPriv *priv = GET_PRIV (object);
+
+  switch (prop_id)
+    {
+    case PROP_CONNECTION:
+      g_value_set_object (value, priv->connection);
+      break;
+    case PROP_CHANNEL:
+      g_value_set_object (value, priv->channel);
+      break;
+    case PROP_CONTACT:
+      g_value_set_object (value, priv->contact);
+      break;
+    case PROP_IS_INCOMING:
+      g_value_set_boolean (value, priv->is_incoming);
+      break;
+    case PROP_STATUS:
+      g_value_set_uint (value, priv->status);
+      break;
+    case PROP_AUDIO_STREAM:
+      g_value_set_pointer (value, priv->audio);
+      break;
+    case PROP_VIDEO_STREAM:
+      g_value_set_pointer (value, priv->video);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
 }
 
 static void
 empathy_tp_call_class_init (EmpathyTpCallClass *klass)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->constructor = tp_call_constructor;
-	object_class->finalize = tp_call_finalize;
-	object_class->set_property = tp_call_set_property;
-	object_class->get_property = tp_call_get_property;
-
-	/* Construct-only properties */
-	g_object_class_install_property (object_class,
-					 PROP_ACCOUNT,
-					 g_param_spec_object ("account",
-							      "channel Account",
-							      "The account associated with the channel",
-							      MC_TYPE_ACCOUNT,
-							      G_PARAM_READWRITE |
-							      G_PARAM_CONSTRUCT_ONLY));
-	g_object_class_install_property (object_class,
-					 PROP_TP_CHAN,
-					 g_param_spec_object ("tp-chan",
-							      "telepathy channel",
-							      "The media channel for the call",
-							      TELEPATHY_CHAN_TYPE,
-							      G_PARAM_READWRITE |
-							      G_PARAM_CONSTRUCT_ONLY));
-
-	/* Normal properties */
-	g_object_class_install_property (object_class,
-					 PROP_STATUS,
-					 g_param_spec_enum ("status",
-							    "call status",
-							    "The status of the call",
-							    EMPATHY_TYPE_TP_CALL_STATUS,
-							    EMPATHY_TP_CALL_STATUS_PREPARING,
-							    G_PARAM_READABLE));
-
-	/* Signals */
-	signals[DESTROY] =
-		g_signal_new ("destroy",
-			      G_TYPE_FROM_CLASS (klass),
-			      G_SIGNAL_RUN_LAST,
-			      0,
-			      NULL, NULL,
-			      g_cclosure_marshal_VOID__VOID,
-			      G_TYPE_NONE,
-			      0);
-
-
-	g_type_class_add_private (klass, sizeof (EmpathyTpCallPriv));
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->constructor = tp_call_constructor;
+  object_class->finalize = tp_call_finalize;
+  object_class->set_property = tp_call_set_property;
+  object_class->get_property = tp_call_get_property;
+
+  g_type_class_add_private (klass, sizeof (EmpathyTpCallPriv));
+
+  signals[STATUS_CHANGED_SIGNAL] =
+      g_signal_new ("status-changed", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID,
+      G_TYPE_NONE, 0);
+  signals[RECEIVING_VIDEO_SIGNAL] =
+      g_signal_new ("receiving-video", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN,
+      G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+  signals[SENDING_VIDEO_SIGNAL] =
+      g_signal_new ("sending-video", G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN,
+      G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+
+  g_object_class_install_property (object_class, PROP_CONNECTION,
+      g_param_spec_object ("connection", "connection", "connection",
+      TELEPATHY_CONN_TYPE,
+      G_PARAM_CONSTRUCT | G_PARAM_READWRITE |
+      G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
+  g_object_class_install_property (object_class, PROP_CHANNEL,
+      g_param_spec_object ("channel", "channel", "channel",
+      TELEPATHY_CHAN_TYPE,
+      G_PARAM_CONSTRUCT | G_PARAM_READWRITE |
+      G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
+  g_object_class_install_property (object_class, PROP_CONTACT,
+      g_param_spec_object ("contact", "Call contact", "Call contact",
+      EMPATHY_TYPE_CONTACT,
+      G_PARAM_READABLE | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
+  g_object_class_install_property (object_class, PROP_IS_INCOMING,
+      g_param_spec_boolean ("is-incoming", "Is media stream incoming",
+      "Is media stream incoming", FALSE, G_PARAM_READABLE |
+      G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
+  g_object_class_install_property (object_class, PROP_STATUS,
+      g_param_spec_uint ("status", "Call status",
+      "Call status", 0, 255, 0, G_PARAM_READABLE | G_PARAM_STATIC_NICK |
+      G_PARAM_STATIC_BLURB));
+  g_object_class_install_property (object_class, PROP_AUDIO_STREAM,
+      g_param_spec_pointer ("audio-stream", "Audio stream data",
+      "Audio stream data",
+      G_PARAM_READABLE | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
+  g_object_class_install_property (object_class, PROP_VIDEO_STREAM,
+      g_param_spec_pointer ("video-stream", "Video stream data",
+      "Video stream data",
+      G_PARAM_READABLE | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB));
 }
 
 static void
 empathy_tp_call_init (EmpathyTpCall *call)
 {
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+
+  priv->status = EMPATHY_TP_CALL_STATUS_READYING;
+  priv->contact = NULL;
+  priv->audio = g_slice_new0 (EmpathyTpCallStream);
+  priv->video = g_slice_new0 (EmpathyTpCallStream);
+  priv->audio->exists = FALSE;
+  priv->video->exists = FALSE;
 }
 
 EmpathyTpCall *
-empathy_tp_call_new (McAccount *account, TpChan *channel)
+empathy_tp_call_new (TpConn *connection, TpChan *channel)
 {
-	return g_object_new (EMPATHY_TYPE_TP_CALL,
-			     "account", account,
-			     "tp_chan", channel,
-			     NULL);
+  return g_object_new (EMPATHY_TYPE_TP_CALL,
+      "connection", connection,
+      "channel", channel,
+      NULL);
 }
 
-gboolean
-empathy_tp_call_is_incoming (EmpathyTpCall *call)
+void
+empathy_tp_call_accept_incoming_call (EmpathyTpCall *call)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  GList *local_pendings;
 
-	return priv->is_incoming;
-}
+  empathy_debug (DEBUG_DOMAIN, "Accepting incoming call");
 
-EmpathyTpCallStatus
-empathy_tp_call_get_status (EmpathyTpCall *call)
-{
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
+  local_pendings = empathy_tp_group_get_local_pendings (priv->group);
 
-	return priv->status;
+  empathy_tp_group_add_member (priv->group, EMPATHY_CONTACT
+      (((EmpathyPendingInfo *) local_pendings->data)->member), NULL);
+
+  g_list_foreach (local_pendings, (GFunc) empathy_pending_info_free, NULL);
+  g_list_free (local_pendings);
 }
 
-EmpathyContact *
-empathy_tp_call_get_contact (EmpathyTpCall *call)
+void
+empathy_tp_call_request_video_stream_direction (EmpathyTpCall *call,
+                                                gboolean is_sending)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-
-	return priv->contact;
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  DBusGProxy *streamed_iface;
+  guint new_direction;
+  GError *error = NULL;
+
+  empathy_debug (DEBUG_DOMAIN,
+      "Requesting video stream direction - is_sending: %d", is_sending);
+
+  if (!priv->video->exists)
+    {
+      tp_call_request_streams_for_capabilities (call, EMPATHY_CAPABILITIES_VIDEO);
+      return;
+    }
+
+  streamed_iface = tp_chan_get_interface (priv->channel,
+      TELEPATHY_CHAN_IFACE_STREAMED_QUARK);
+
+  if (is_sending)
+    {
+      new_direction = priv->video->direction | TP_MEDIA_STREAM_DIRECTION_SEND;
+    }
+  else
+    {
+      new_direction = priv->video->direction & ~TP_MEDIA_STREAM_DIRECTION_SEND;
+    }
+
+  if (!tp_chan_type_streamed_media_request_stream_direction (streamed_iface,
+        priv->video->id, new_direction, &error))
+    {
+      empathy_debug (DEBUG_DOMAIN,
+          "Couldn't request video stream direction: %s", error->message);
+      g_clear_error (&error);
+    }
 }
 
 void
-empathy_tp_call_accept (EmpathyTpCall *call)
+empathy_tp_call_close_channel (EmpathyTpCall *call)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-	EmpathyContact    *contact;
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  GError *error = NULL;
+
+  empathy_debug (DEBUG_DOMAIN, "Closing channel");
 
-	contact = empathy_tp_group_get_self_contact (priv->group);
-	empathy_tp_group_add_member (priv->group, contact, "");
+  if (!tp_chan_close (DBUS_G_PROXY (priv->channel), &error))
+    {
+      empathy_debug (DEBUG_DOMAIN, "Error closing channel: %s",
+          error ? error->message : "No error given");
+      g_clear_error (&error);
+    }
 }
 
 void
-empathy_tp_call_invite (EmpathyTpCall  *call,
-			EmpathyContact *contact)
+empathy_tp_call_add_preview_video (guint preview_video_socket_id)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
+  GError *error = NULL;
+  DBusGProxy *ch_proxy;
 
-	empathy_tp_group_add_member (priv->group, contact, "you're welcome");
-}
+  empathy_debug (DEBUG_DOMAIN, "Adding preview video");
 
-void
-empathy_tp_call_request_streams (EmpathyTpCall *call,
-				 gboolean       audio,
-				 gboolean       video)
-{
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-	GArray            *stream_types;
-	guint              handle;
-	guint              type;
-
-	empathy_debug (DEBUG_DOMAIN, "Requesting streams for audio=%s video=%s",
-		       audio ? "Yes" : "No",
-		       video ? "Yes" : "No");
-
-	stream_types = g_array_new (FALSE, FALSE, sizeof (guint));
-	if (audio) {
-		type = TP_MEDIA_STREAM_TYPE_AUDIO;
-		g_array_append_val (stream_types, type);
-	}
-	if (video) {
-		type = TP_MEDIA_STREAM_TYPE_VIDEO;
-		g_array_append_val (stream_types, type);
-	}
-
-	handle = empathy_contact_get_handle (priv->contact);
-	tp_chan_type_streamed_media_request_streams_async (priv->streamed_iface,
-							   handle,
-							   stream_types,
-							   tp_call_list_streams_cb,
-							   call);
-
-	g_array_free (stream_types, TRUE);
-}
+  ch_proxy = dbus_g_proxy_new_for_name (tp_get_bus (), STREAM_ENGINE_BUS_NAME,
+      STREAM_ENGINE_OBJECT_PATH, STREAM_ENGINE_INTERFACE);
 
-void
-empathy_tp_call_send_video (EmpathyTpCall *call,
-			    gboolean       send)
-{
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-	guint              new_direction;
-
-	if (!priv->video_stream) {
-		return;
-	}
-
-	if (send) {
-		new_direction = TP_MEDIA_STREAM_DIRECTION_BIDIRECTIONAL;
-	} else {
-		new_direction = TP_MEDIA_STREAM_DIRECTION_RECEIVE;
-	}
-
-	tp_chan_type_streamed_media_request_stream_direction_async (priv->streamed_iface,
-								    priv->video_stream,
-								    new_direction,
-								    tp_call_async_cb,
-								    "request stream direction");
+  if (!org_freedesktop_Telepathy_StreamEngine_add_preview_window (ch_proxy,
+        preview_video_socket_id, &error))
+    {
+      empathy_debug (DEBUG_DOMAIN, "Couldn't set video preview: %s",
+          error->message);
+      g_clear_error (&error);
+    }
 }
 
 void
-empathy_tp_call_add_preview_window (EmpathyTpCall *call,
-				    guint          socket_id)
+empathy_tp_call_remove_preview_video (guint preview_video_socket_id)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
+  GError *error = NULL;
+  DBusGProxy *ch_proxy;
 
-	org_freedesktop_Telepathy_StreamEngine_add_preview_window_async (priv->se_proxy,
-									 socket_id,
-									 tp_call_async_cb,
-									 "add preview window");
-}
+  empathy_debug (DEBUG_DOMAIN, "Removing preview video");
 
-void
-empathy_tp_call_remove_preview_window (EmpathyTpCall *call,
-				       guint          socket_id)
-{
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
+  ch_proxy = dbus_g_proxy_new_for_name (tp_get_bus (), STREAM_ENGINE_BUS_NAME,
+      STREAM_ENGINE_OBJECT_PATH, STREAM_ENGINE_INTERFACE);
 
-	org_freedesktop_Telepathy_StreamEngine_remove_preview_window_async (priv->se_proxy,
-									    socket_id,
-									    tp_call_async_cb,
-									    "remove preview window");
+  if (!org_freedesktop_Telepathy_StreamEngine_remove_preview_window (ch_proxy,
+        preview_video_socket_id, &error))
+    {
+      empathy_debug (DEBUG_DOMAIN, "Couldn't set video preview: %s",
+          error->message);
+      g_clear_error (&error);
+    }
 }
 
 void
-empathy_tp_call_set_output_window (EmpathyTpCall *call,
-				   guint          socket_id)
+empathy_tp_call_add_output_video (EmpathyTpCall *call,
+                                  guint output_video_socket_id)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-
-	org_freedesktop_Telepathy_StreamEngine_set_output_window_async (priv->se_proxy,
-									dbus_g_proxy_get_path (DBUS_G_PROXY (priv->tp_chan)),
-									priv->video_stream,
-									socket_id,
-									tp_call_async_cb,
-									"set output window");
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  const gchar *object_path;
+  DBusGProxy *ch_proxy;
+  GError *error = NULL;
+
+  empathy_debug (DEBUG_DOMAIN, "Adding output video - socket: %d",
+      output_video_socket_id);
+
+  object_path = dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel));
+  ch_proxy = dbus_g_proxy_new_for_name (tp_get_bus (), STREAM_ENGINE_BUS_NAME,
+      STREAM_ENGINE_OBJECT_PATH, STREAM_ENGINE_INTERFACE);
+
+  if (!org_freedesktop_Telepathy_StreamEngine_set_output_window (ch_proxy,
+        object_path, priv->video->id, output_video_socket_id, &error))
+    {
+      empathy_debug (DEBUG_DOMAIN, "Couldn't set video output: %s",
+          error->message);
+      g_clear_error (&error);
+    }
 }
 
 void
 empathy_tp_call_set_output_volume (EmpathyTpCall *call,
-				   guint          volume)
+                                   guint volume)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-
-	org_freedesktop_Telepathy_StreamEngine_set_output_volume_async (priv->se_proxy,
-									dbus_g_proxy_get_path (DBUS_G_PROXY (priv->tp_chan)),
-									priv->audio_stream,
-									volume,
-									tp_call_async_cb,
-									"set output volume");
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  const gchar *object_path;
+  DBusGProxy *ch_proxy;
+  GError *error = NULL;
+
+  if (priv->status == EMPATHY_TP_CALL_STATUS_CLOSED)
+    return;
+
+  empathy_debug (DEBUG_DOMAIN, "Setting output volume: %d", volume);
+
+  object_path = dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel));
+  ch_proxy = dbus_g_proxy_new_for_name (tp_get_bus (), STREAM_ENGINE_BUS_NAME,
+      STREAM_ENGINE_OBJECT_PATH, STREAM_ENGINE_INTERFACE);
+
+  if (!org_freedesktop_Telepathy_StreamEngine_set_output_volume (ch_proxy,
+        object_path, priv->audio->id, volume, &error))
+    {
+      empathy_debug (DEBUG_DOMAIN, "Couldn't set volume: %s", error->message);
+      g_clear_error (&error);
+    }
 }
 
 
 void
 empathy_tp_call_mute_output (EmpathyTpCall *call,
-                             gboolean       is_muted)
+                             gboolean is_muted)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-
-	org_freedesktop_Telepathy_StreamEngine_mute_output_async (priv->se_proxy,
-								  dbus_g_proxy_get_path (DBUS_G_PROXY (priv->tp_chan)),
-								  priv->audio_stream,
-								  is_muted,
-								  tp_call_async_cb,
-								  "mute output");
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  const gchar *object_path;
+  DBusGProxy *ch_proxy;
+  GError *error = NULL;
+
+  if (priv->status == EMPATHY_TP_CALL_STATUS_CLOSED)
+    return;
+
+  empathy_debug (DEBUG_DOMAIN, "Setting output mute: %d", is_muted);
+
+  object_path = dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel));
+  ch_proxy = dbus_g_proxy_new_for_name (tp_get_bus (), STREAM_ENGINE_BUS_NAME,
+      STREAM_ENGINE_OBJECT_PATH, STREAM_ENGINE_INTERFACE);
+
+  if (!org_freedesktop_Telepathy_StreamEngine_mute_output (ch_proxy,
+        object_path, priv->audio->id, is_muted, &error))
+    {
+      empathy_debug (DEBUG_DOMAIN, "Couldn't mute output: %s", error->message);
+      g_clear_error (&error);
+    }
 }
 
-
 void
 empathy_tp_call_mute_input (EmpathyTpCall *call,
-                            gboolean       is_muted)
+                            gboolean is_muted)
 {
-	EmpathyTpCallPriv *priv = GET_PRIV (call);
-
-	org_freedesktop_Telepathy_StreamEngine_mute_input_async (priv->se_proxy,
-								 dbus_g_proxy_get_path (DBUS_G_PROXY (priv->tp_chan)),
-								 priv->audio_stream,
-								 is_muted,
-								 tp_call_async_cb,
-								 "mute output");
+  EmpathyTpCallPriv *priv = GET_PRIV (call);
+  const gchar *object_path;
+  DBusGProxy *ch_proxy;
+  GError *error = NULL;
+
+  if (priv->status == EMPATHY_TP_CALL_STATUS_CLOSED)
+    return;
+
+  empathy_debug (DEBUG_DOMAIN, "Setting input mute: %d", is_muted);
+
+  object_path = dbus_g_proxy_get_path (DBUS_G_PROXY (priv->channel));
+  ch_proxy = dbus_g_proxy_new_for_name (tp_get_bus (), STREAM_ENGINE_BUS_NAME,
+      STREAM_ENGINE_OBJECT_PATH, STREAM_ENGINE_INTERFACE);
+
+  if (!org_freedesktop_Telepathy_StreamEngine_mute_input (ch_proxy,
+        object_path, priv->audio->id, is_muted, &error))
+    {
+      empathy_debug (DEBUG_DOMAIN, "Couldn't mute input: %s", error->message);
+      g_clear_error (&error);
+    }
 }
 
diff --git a/libempathy/empathy-tp-call.h b/libempathy/empathy-tp-call.h
index 13ab33fcb..69f873425 100644
--- a/libempathy/empathy-tp-call.h
+++ b/libempathy/empathy-tp-call.h
@@ -1,88 +1,90 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2007 Elliot Fairweather
- * Copyright (C) 2007 Collabora Ltd.
+ *  Copyright (C) 2007 Elliot Fairweather
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * Authors: Elliot Fairweather <elliot.fairweather@collabora.co.uk>
- *          Xavier Claessens <xclaesse@gmail.com>
+ *  Authors: Elliot Fairweather <elliot.fairweather@collabora.co.uk>
  */
 
 #ifndef __EMPATHY_TP_CALL_H__
 #define __EMPATHY_TP_CALL_H__
 
 #include <libtelepathy/tp-chan.h>
-#include <libtelepathy/tp-constants.h>
+#include <libtelepathy/tp-conn.h>
 
-#include <libmissioncontrol/mc-account.h>
+#include <libmissioncontrol/mission-control.h>
 
-#include "empathy-contact.h"
+#include <libempathy/empathy-chandler.h>
+#include <libempathy/empathy-contact.h>
+#include <libempathy/empathy-tp-group.h>
 
 G_BEGIN_DECLS
 
-#define EMPATHY_TYPE_TP_CALL              (empathy_tp_call_get_type ())
-#define EMPATHY_TP_CALL(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), EMPATHY_TYPE_TP_CALL, EmpathyTpCall))
-#define EMPATHY_TP_CALL_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST((klass), EMPATHY_TYPE_TP_CALL, EmpathyTpCallClass))
-#define EMPATHY_IS_TP_CALL(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), EMPATHY_TYPE_TP_CALL))
-#define EMPATHY_IS_TP_CALL_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), EMPATHY_TYPE_TP_CALL))
-#define EMPATHY_TP_CALL_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), EMPATHY_TYPE_TP_CALL, EmpathyTpCallClass))
+#define EMPATHY_TYPE_TP_CALL (empathy_tp_call_get_type ())
+#define EMPATHY_TP_CALL(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), \
+    EMPATHY_TYPE_TP_CALL, EmpathyTpCall))
+#define EMPATHY_TP_CALL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), \
+    EMPATHY_TYPE_TP_CALL, EmpathyTpCallClass))
+#define EMPATHY_IS_TP_CALL(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), \
+    EMPATHY_TYPE_TP_CALL))
+#define EMPATHY_IS_TP_CALL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+    EMPATHY_TYPE_TP_CALL))
+#define EMPATHY_TP_CALL_GET_CLASS(object) (G_TYPE_INSTANCE_GET_CLASS ((object), \
+    EMPATHY_TYPE_TP_CALL, EmpathyTpCallClass))
 
 typedef struct _EmpathyTpCall EmpathyTpCall;
 typedef struct _EmpathyTpCallClass EmpathyTpCallClass;
 
 struct _EmpathyTpCall {
-	GObject parent;
+    GObject parent;
 };
 
 struct _EmpathyTpCallClass {
-	GObjectClass parent_class;
+    GObjectClass parent_class;
 };
 
-typedef enum {
-	EMPATHY_TP_CALL_STATUS_PREPARING,
-	EMPATHY_TP_CALL_STATUS_RINGING,
-	EMPATHY_TP_CALL_STATUS_RUNNING
+typedef enum
+{
+  EMPATHY_TP_CALL_STATUS_READYING,
+  EMPATHY_TP_CALL_STATUS_PENDING,
+  EMPATHY_TP_CALL_STATUS_ACCEPTED,
+  EMPATHY_TP_CALL_STATUS_CLOSED
 } EmpathyTpCallStatus;
 
-GType               empathy_tp_call_get_type              (void) G_GNUC_CONST;
-EmpathyTpCall *     empathy_tp_call_new                   (McAccount      *account,
-							   TpChan         *tp_chan);
-gboolean            empathy_tp_call_is_incoming           (EmpathyTpCall  *call);
-EmpathyTpCallStatus empathy_tp_call_get_status            (EmpathyTpCall  *call);
-EmpathyContact *    empathy_tp_call_get_contact           (EmpathyTpCall  *call);
-void                empathy_tp_call_accept                (EmpathyTpCall  *call);
-void                empathy_tp_call_invite                (EmpathyTpCall  *call,
-							   EmpathyContact *contact);
-void                empathy_tp_call_request_streams       (EmpathyTpCall  *call,
-							   gboolean        audio,
-							   gboolean        video);
-void                empathy_tp_call_send_video            (EmpathyTpCall  *call,
-							   gboolean        send);
-void                empathy_tp_call_add_preview_window    (EmpathyTpCall  *call,
-							   guint           socket_id);
-void                empathy_tp_call_remove_preview_window (EmpathyTpCall  *call,
-							   guint           socket_id);
-void                empathy_tp_call_set_output_window     (EmpathyTpCall  *call,
-							   guint           socket_id);
-void                empathy_tp_call_set_output_volume     (EmpathyTpCall  *call,
-							   guint           volume);
-void                empathy_tp_call_mute_output           (EmpathyTpCall  *call,
-							   gboolean        is_muted);
-void                empathy_tp_call_mute_input            (EmpathyTpCall  *call,
-							   gboolean        is_muted);
+typedef struct
+{
+  gboolean exists;
+  guint id;
+  guint state;
+  guint direction;
+} EmpathyTpCallStream;
+
+GType empathy_tp_call_get_type (void) G_GNUC_CONST;
+EmpathyTpCall *empathy_tp_call_new (TpConn *connection, TpChan *channel);
+
+void empathy_tp_call_accept_incoming_call (EmpathyTpCall *call);
+void empathy_tp_call_close_channel (EmpathyTpCall *call);
+void empathy_tp_call_request_video_stream_direction (EmpathyTpCall *call,
+    gboolean is_sending);
+void empathy_tp_call_add_preview_video (guint preview_video_socket_id);
+void empathy_tp_call_remove_preview_video (guint preview_video_socket_id);
+void empathy_tp_call_add_output_video (EmpathyTpCall *call,
+    guint output_video_socket_id);
+void empathy_tp_call_set_output_volume (EmpathyTpCall *call, guint volume);
+void empathy_tp_call_mute_output (EmpathyTpCall *call, gboolean is_muted);
+void empathy_tp_call_mute_input (EmpathyTpCall *call, gboolean is_muted);
 
 G_END_DECLS
 
diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c
index 796d23ddf..8c6edafc5 100644
--- a/libempathy/empathy-utils.c
+++ b/libempathy/empathy-utils.c
@@ -37,6 +37,7 @@
 
 #include "empathy-debug.h"
 #include "empathy-utils.h"
+#include "empathy-contact-factory.h"
 #include "empathy-contact-manager.h"
 #include "empathy-tp-group.h"
 
@@ -397,19 +398,61 @@ empathy_inspect_handle (McAccount *account,
 }
 
 void
-empathy_call_with_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 ();
-	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);
+	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);
+
+	group = empathy_tp_group_new (account, new_chan);
+	empathy_tp_group_add_member (group, contact, "");
+
+	g_object_unref (group);
 	g_object_unref (mc);
+	g_object_unref (tp_conn);
+	g_object_unref (new_chan);
+	g_free (object_path);
 #endif
 }
 
@@ -417,16 +460,14 @@ void
 empathy_call_with_contact_id (McAccount *account, const gchar *contact_id)
 {
 #ifdef HAVE_VOIP
-	MissionControl *mc;
-
-	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);
+	EmpathyContactFactory *factory;
+	EmpathyContact        *contact;
+
+	factory = empathy_contact_factory_new ();
+	contact = empathy_contact_factory_get_from_id (factory, account, contact_id);
+	empathy_call_with_contact (contact);
+	g_object_unref (contact);
+	g_object_unref (factory);
 #endif
 }