]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-dispatcher.c
Remove g_object_ref from empathy_dispatch_operation_get_tp_connection. Fixes #579780
[empathy.git] / libempathy / empathy-dispatcher.c
index 69a8e80cc8d5dc3ef77665a2408ab9cf7aa3ff90..c8a0f9e60b043e5effd618a6ab3d71930267c841 100644 (file)
@@ -1,6 +1,4 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2007-2008 Collabora Ltd.
+/* * Copyright (C) 2007-2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
 
 #include <string.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <telepathy-glib/enums.h>
 #include <telepathy-glib/connection.h>
 #include <telepathy-glib/util.h>
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/proxy-subclass.h>
+#include <telepathy-glib/gtypes.h>
 
 #include <libmissioncontrol/mission-control.h>
-#include <libmissioncontrol/mc-account.h>
 
 #include <extensions/extensions.h>
 
 #include "empathy-dispatcher.h"
 #include "empathy-utils.h"
 #include "empathy-tube-handler.h"
-#include "empathy-contact-factory.h"
-#include "empathy-tp-group.h"
+#include "empathy-account-manager.h"
+#include "empathy-tp-contact-factory.h"
+#include "empathy-tp-file.h"
 #include "empathy-chatroom-manager.h"
 #include "empathy-utils.h"
 
 #include <libempathy/empathy-debug.h>
 
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyDispatcher)
-typedef struct {
-       GHashTable     *connections;
-       gpointer        token;
-       MissionControl *mc;
-       GSList         *tubes;
-  EmpathyChatroomManager *chatroom_mgr;
+typedef struct
+{
+  EmpathyAccountManager *account_manager;
+  MissionControl *mc;
+  /* connection to connection data mapping */
+  GHashTable *connections;
+  gpointer token;
+  GSList *tubes;
+
+  /* channels which the dispatcher is listening "invalidated" */
+  GList *channels;
 } EmpathyDispatcherPriv;
 
 G_DEFINE_TYPE (EmpathyDispatcher, empathy_dispatcher, G_TYPE_OBJECT);
 
-enum {
-       DISPATCH_CHANNEL,
-       FILTER_CHANNEL,
-       FILTER_TUBE,
-       LAST_SIGNAL
+enum
+{
+  OBSERVE,
+  APPROVE,
+  DISPATCH,
+  LAST_SIGNAL
 };
 
 static guint signals[LAST_SIGNAL];
 static EmpathyDispatcher *dispatcher = NULL;
 
-void
-empathy_dispatcher_channel_process (EmpathyDispatcher *dispatcher,
-                                   TpChannel         *channel)
+typedef struct
 {
-       g_signal_emit (dispatcher, signals[DISPATCH_CHANNEL], 0, channel);
-}
+  EmpathyDispatcher *dispatcher;
+  EmpathyDispatchOperation *operation;
+  TpConnection *connection;
+  gchar *channel_type;
+  guint handle_type;
+  guint handle;
+  EmpathyContact *contact;
+
+  /* Properties to pass to the channel when requesting it */
+  GHashTable *request;
+  EmpathyDispatcherRequestCb *cb;
+  gpointer user_data;
+  gpointer *request_data;
+} DispatcherRequestData;
+
+typedef struct
+{
+  TpChannel *channel;
+  /* Channel type specific wrapper object */
+  GObject *channel_wrapper;
+} DispatchData;
 
-typedef struct {
-       EmpathyDispatcherTube  public;
-       EmpathyContactFactory *factory;
-       gchar                 *bus_name;
-       gchar                 *object_path;
-       guint                  ref_count;
-       gboolean               handled;
-} DispatcherTube;
-
-GType
-empathy_dispatcher_tube_get_type (void)
+typedef struct
+{
+  /* ObjectPath => DispatchData.. */
+  GHashTable *dispatched_channels;
+  /* ObjectPath -> EmpathyDispatchOperations */
+  GHashTable *dispatching_channels;
+  /* ObjectPath -> EmpathyDispatchOperations */
+  GHashTable *outstanding_channels;
+  /* List of DispatcherRequestData */
+  GList *outstanding_requests;
+  /* List of requestable channel classes */
+  GPtrArray *requestable_channels;
+} ConnectionData;
+
+static DispatchData *
+new_dispatch_data (TpChannel *channel,
+                   GObject *channel_wrapper)
 {
-       static GType type_id = 0;
+  DispatchData *d = g_slice_new0 (DispatchData);
+  d->channel = g_object_ref (channel);
+  if (channel_wrapper != NULL)
+    d->channel_wrapper = g_object_ref (channel_wrapper);
 
-       if (!type_id) {
-               type_id = g_boxed_type_register_static ("EmpathyDispatcherTube",
-                                                       (GBoxedCopyFunc) empathy_dispatcher_tube_ref,
-                                                       (GBoxedFreeFunc) empathy_dispatcher_tube_unref);
-       }
+  return d;
+}
+
+static void
+free_dispatch_data (DispatchData *data)
+{
+  g_object_unref (data->channel);
+  if (data->channel_wrapper != NULL)
+    g_object_unref (data->channel_wrapper);
 
-       return type_id;
+  g_slice_free (DispatchData, data);
 }
 
-EmpathyDispatcherTube *
-empathy_dispatcher_tube_ref (EmpathyDispatcherTube *data)
+static DispatcherRequestData *
+new_dispatcher_request_data (EmpathyDispatcher *dispatcher,
+                             TpConnection *connection,
+                             const gchar *channel_type,
+                             guint handle_type,
+                             guint handle,
+                             GHashTable *request,
+                             EmpathyContact *contact,
+                             EmpathyDispatcherRequestCb *cb,
+                             gpointer user_data)
 {
-       DispatcherTube *tube = (DispatcherTube*) data;
+  DispatcherRequestData *result = g_slice_new0 (DispatcherRequestData);
 
-       g_return_val_if_fail (tube != NULL, NULL);
+  result->dispatcher = g_object_ref (dispatcher);
+  result->connection = connection;
 
-       tube->ref_count++;
+  result->channel_type = g_strdup (channel_type);
+  result->handle_type = handle_type;
+  result->handle = handle;
+  result->request = request;
 
-       return data;
-}
+  if (contact != NULL)
+    result->contact = g_object_ref (contact);
 
-void
-empathy_dispatcher_tube_unref (EmpathyDispatcherTube *data)
-{
-       DispatcherTube *tube = (DispatcherTube*) data;
-
-       g_return_if_fail (tube != NULL);
-
-       if (--tube->ref_count == 0) {
-               if (!tube->handled) {
-                       DEBUG ("Tube can't be handled, closing");
-                       tp_cli_channel_type_tubes_call_close_tube (tube->public.channel, -1,
-                                                                  tube->public.id,
-                                                                  NULL, NULL, NULL,
-                                                                  NULL);
-               }
-
-               g_free (tube->bus_name);
-               g_free (tube->object_path);
-               g_object_unref (tube->factory);
-               g_object_unref (tube->public.channel);
-               g_object_unref (tube->public.initiator);
-               g_slice_free (DispatcherTube, tube);
-       }
+  result->cb = cb;
+  result->user_data = user_data;
+
+  return result;
 }
 
 static void
-dispatcher_tubes_handle_tube_cb (TpProxy      *channel,
-                                const GError *error,
-                                gpointer      user_data,
-                                GObject      *dispatcher)
+free_dispatcher_request_data (DispatcherRequestData *r)
 {
-       DispatcherTube *tube = user_data;
+  g_free (r->channel_type);
 
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-       } else {
-               tube->handled = TRUE;
-       }
+  if (r->dispatcher != NULL)
+    g_object_unref (r->dispatcher);
+
+  if (r->contact != NULL)
+    g_object_unref (r->contact);
+
+  if (r->request != NULL)
+    g_hash_table_unref (r->request);
+
+  g_slice_free (DispatcherRequestData, r);
 }
 
-void
-empathy_dispatcher_tube_process (EmpathyDispatcher     *dispatcher,
-                                EmpathyDispatcherTube *user_data)
+static ConnectionData *
+new_connection_data (void)
 {
-       DispatcherTube *tube = (DispatcherTube*) user_data;
-
-       if (tube->public.activatable) {
-               TpProxy *connection;
-               TpProxy *thandler;
-               gchar   *object_path;
-               guint    handle_type;
-               guint    handle;
-
-               /* Create the proxy for the tube handler */
-               thandler = g_object_new (TP_TYPE_PROXY,
-                                        "dbus-connection", tp_get_bus (),
-                                        "bus-name", tube->bus_name,
-                                        "object-path", tube->object_path,
-                                        NULL);
-               tp_proxy_add_interface_by_id (thandler, EMP_IFACE_QUARK_TUBE_HANDLER);
-
-               /* Give the tube to the handler */
-               g_object_get (tube->public.channel,
-                             "connection", &connection,
-                             "object-path", &object_path,
-                             "handle_type", &handle_type,
-                             "handle", &handle,
-                             NULL);
-
-               DEBUG ("Dispatching tube");
-               emp_cli_tube_handler_call_handle_tube (thandler, -1,
-                                                      connection->bus_name,
-                                                      connection->object_path,
-                                                      object_path, handle_type,
-                                                      handle, tube->public.id,
-                                                      dispatcher_tubes_handle_tube_cb,
-                                                      empathy_dispatcher_tube_ref (user_data),
-                                                      (GDestroyNotify) empathy_dispatcher_tube_unref,
-                                                      G_OBJECT (dispatcher));
-
-               g_object_unref (thandler);
-               g_object_unref (connection);
-               g_free (object_path);
-       }
+  ConnectionData *cd = g_slice_new0 (ConnectionData);
+
+  cd->dispatched_channels = g_hash_table_new_full (g_str_hash, g_str_equal,
+      g_free, (GDestroyNotify) free_dispatch_data);
+
+  cd->dispatching_channels = g_hash_table_new_full (g_str_hash, g_str_equal,
+      g_free, g_object_unref);
+
+  cd->outstanding_channels = g_hash_table_new_full (g_str_hash, g_str_equal,
+      g_free, NULL);
+
+  return cd;
 }
 
 static void
-dispatcher_tubes_new_tube_cb (TpChannel   *channel,
-                             guint        id,
-                             guint        initiator,
-                             guint        type,
-                             const gchar *service,
-                             GHashTable  *parameters,
-                             guint        state,
-                             gpointer     user_data,
-                             GObject     *dispatcher)
+free_connection_data (ConnectionData *cd)
 {
-       static TpDBusDaemon   *daemon = NULL;
-       DispatcherTube        *tube;
-       McAccount             *account;
-       guint                  number;
-       gchar                **names;
-       gboolean               running = FALSE;
-       GError                *error = NULL;
-
-       /* Increase tube count */
-       number = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (channel), "tube-count"));
-       g_object_set_data (G_OBJECT (channel), "tube-count", GUINT_TO_POINTER (++number));
-       DEBUG ("Increased tube count for channel %p: %d", channel, number);
-
-       /* We dispatch only local pending tubes */
-       if (state != TP_TUBE_STATE_LOCAL_PENDING) {
-               return;
-       }
-
-       if (!daemon) {
-               daemon = tp_dbus_daemon_new (tp_get_bus ());
-       }
-
-       account = empathy_channel_get_account (channel);
-       tube = g_slice_new (DispatcherTube);
-       tube->ref_count = 1;
-       tube->handled = FALSE;
-       tube->factory = empathy_contact_factory_new ();
-       tube->bus_name = empathy_tube_handler_build_bus_name (type, service);
-       tube->object_path = empathy_tube_handler_build_object_path (type, service);
-       tube->public.activatable = FALSE;
-       tube->public.id = id;
-       tube->public.channel = g_object_ref (channel);
-       tube->public.initiator = empathy_contact_factory_get_from_handle (tube->factory,
-                                                                         account,
-                                                                         initiator);
-       g_object_unref (account);
-
-       /* Check if that bus-name has an owner, if it has one that means the
-        * app is already running and we can directly give the channel. */
-       tp_cli_dbus_daemon_run_name_has_owner (daemon, -1, tube->bus_name,
-                                              &running, NULL, NULL);
-       if (running) {
-               DEBUG ("Tube handler running");
-               tube->public.activatable = TRUE;
-               empathy_dispatcher_tube_process (EMPATHY_DISPATCHER (dispatcher),
-                                                (EmpathyDispatcherTube*) tube);
-               empathy_dispatcher_tube_unref ((EmpathyDispatcherTube*) tube);
-               return;
-       }
-
-       /* Check if that bus-name is activatable, if not that means the
-        * application needed to handle this tube isn't installed. */
-       if (!tp_cli_dbus_daemon_run_list_activatable_names (daemon, -1,
-                                                           &names, &error,
-                                                           NULL)) {
-               DEBUG ("Error listing activatable names: %s", error->message);
-               g_clear_error (&error);
-       } else {
-               gchar **name;
-
-               for (name = names; *name; name++) {
-                       if (!tp_strdiff (*name, tube->bus_name)) {
-                               tube->public.activatable = TRUE;
-                               break;
-                       }
-               }
-               g_strfreev (names);
-       }
-
-       g_signal_emit (dispatcher, signals[FILTER_TUBE], 0, tube);
-       empathy_dispatcher_tube_unref ((EmpathyDispatcherTube*) tube);
+  GList *l;
+
+  g_hash_table_destroy (cd->dispatched_channels);
+  g_hash_table_destroy (cd->dispatching_channels);
+  int i;
+
+  for (l = cd->outstanding_requests ; l != NULL; l = g_list_delete_link (l,l))
+    {
+      free_dispatcher_request_data (l->data);
+    }
+
+  if (cd->requestable_channels  != NULL)
+    {
+      for (i = 0 ; i < cd->requestable_channels->len ; i++)
+          g_value_array_free (
+            g_ptr_array_index (cd->requestable_channels, i));
+      g_ptr_array_free (cd->requestable_channels, TRUE);
+    }
 }
 
 static void
-dispatcher_tubes_list_tubes_cb (TpChannel       *channel,
-                               const GPtrArray *tubes,
-                               const GError    *error,
-                               gpointer         user_data,
-                               GObject         *dispatcher)
+dispatcher_connection_invalidated_cb (TpConnection *connection,
+                                      guint domain,
+                                      gint code,
+                                      gchar *message,
+                                      EmpathyDispatcher *dispatcher)
 {
-       guint i;
-
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-               return;
-       }
-
-       for (i = 0; i < tubes->len; i++) {
-               GValueArray *values;
-
-               values = g_ptr_array_index (tubes, i);
-               dispatcher_tubes_new_tube_cb (channel,
-                                             g_value_get_uint (g_value_array_get_nth (values, 0)),
-                                             g_value_get_uint (g_value_array_get_nth (values, 1)),
-                                             g_value_get_uint (g_value_array_get_nth (values, 2)),
-                                             g_value_get_string (g_value_array_get_nth (values, 3)),
-                                             g_value_get_boxed (g_value_array_get_nth (values, 4)),
-                                             g_value_get_uint (g_value_array_get_nth (values, 5)),
-                                             user_data, dispatcher);
-       }
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+
+  DEBUG ("Error: %s", message);
+  g_hash_table_remove (priv->connections, connection);
 }
 
-static void
-dispatcher_tubes_channel_invalidated_cb (TpProxy           *proxy,
-                                        guint              domain,
-                                        gint               code,
-                                        gchar             *message,
-                                        EmpathyDispatcher *dispatcher)
+static gboolean
+dispatcher_operation_can_start (EmpathyDispatcher *self,
+                                EmpathyDispatchOperation *operation,
+                                ConnectionData *cd)
 {
-       EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  GList *l;
+  const gchar *channel_type =
+    empathy_dispatch_operation_get_channel_type (operation);
 
-       DEBUG ("%s", message);
+  for (l = cd->outstanding_requests; l != NULL; l = g_list_next (l))
+    {
+      DispatcherRequestData *d = (DispatcherRequestData *) l->data;
 
-       priv->tubes = g_slist_remove (priv->tubes, proxy);
-       g_object_unref (proxy);
+      if (d->operation == NULL && !tp_strdiff (d->channel_type, channel_type))
+        {
+          return FALSE;
+        }
+    }
+
+  return TRUE;
 }
 
 static void
-dispatcher_tubes_tube_closed_cb (TpChannel *channel,
-                                guint      id,
-                                gpointer   user_data,
-                                GObject   *dispatcher)
+dispatch_operation_flush_requests (EmpathyDispatcher *dispatcher,
+                                   EmpathyDispatchOperation *operation,
+                                   GError *error,
+                                   ConnectionData *cd)
 {
-       guint number;
-
-       number = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (channel), "tube-count"));
-       if (number == 1) {
-               DEBUG ("No more tube, closing channel");
-               tp_cli_channel_call_close (channel, -1, NULL, NULL, NULL, NULL);
-       }
-       else if (number > 1) {
-               DEBUG ("Decrease tube count: %d", number);
-               g_object_set_data (G_OBJECT (channel), "tube-count", GUINT_TO_POINTER (--number));
-       }
+  GList *l;
+
+  l = cd->outstanding_requests;
+  while (l != NULL)
+    {
+      DispatcherRequestData *d = (DispatcherRequestData *) l->data;
+      GList *lt = l;
+
+      l = g_list_next (l);
+
+      if (d->operation == operation)
+        {
+          if (d->cb != NULL)
+            {
+              if (error != NULL)
+                d->cb (NULL, error, d->user_data);
+              else
+                d->cb (operation, NULL, d->user_data);
+            }
+
+          cd->outstanding_requests = g_list_delete_link
+            (cd->outstanding_requests, lt);
+
+          free_dispatcher_request_data (d);
+        }
+    }
 }
 
 static void
-dispatcher_tubes_handle_channel (EmpathyDispatcher *dispatcher,
-                                TpChannel         *channel)
+dispatcher_channel_invalidated_cb (TpProxy *proxy,
+                                   guint domain,
+                                   gint code,
+                                   gchar *message,
+                                   EmpathyDispatcher *dispatcher)
 {
-       EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
-
-       DEBUG ("Called");
-
-       priv->tubes = g_slist_prepend (priv->tubes, g_object_ref (channel));
-       g_signal_connect (channel, "invalidated",
-                         G_CALLBACK (dispatcher_tubes_channel_invalidated_cb),
-                         dispatcher);
-
-       tp_cli_channel_type_tubes_connect_to_tube_closed (channel,
-                                                         dispatcher_tubes_tube_closed_cb,
-                                                         NULL, NULL,
-                                                         G_OBJECT (dispatcher), NULL);
-       tp_cli_channel_type_tubes_connect_to_new_tube (channel,
-                                                      dispatcher_tubes_new_tube_cb,
-                                                      NULL, NULL,
-                                                      G_OBJECT (dispatcher), NULL);
-       tp_cli_channel_type_tubes_call_list_tubes (channel, -1,
-                                                  dispatcher_tubes_list_tubes_cb,
-                                                  NULL, NULL,
-                                                  G_OBJECT (dispatcher));
+  /* Channel went away... */
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  TpConnection *connection;
+  EmpathyDispatchOperation *operation;
+  ConnectionData *cd;
+  const gchar *object_path;
+
+  connection = tp_channel_borrow_connection (TP_CHANNEL (proxy));
+
+  cd = g_hash_table_lookup (priv->connections, connection);
+  /* Connection itself invalidated? */
+  if (cd == NULL)
+    return;
+
+  object_path = tp_proxy_get_object_path (proxy);
+
+  DEBUG ("Channel %s invalidated", object_path);
+
+  g_hash_table_remove (cd->dispatched_channels, object_path);
+  g_hash_table_remove (cd->dispatching_channels, object_path);
+
+  priv->channels = g_list_remove (priv->channels, proxy);
+
+  operation = g_hash_table_lookup (cd->outstanding_channels, object_path);
+  if (operation != NULL)
+    {
+      GError error = { domain, code, message };
+      dispatch_operation_flush_requests (dispatcher, operation, &error, cd);
+      g_hash_table_remove (cd->outstanding_channels, object_path);
+      g_object_unref (operation);
+    }
 }
 
 static void
-dispatcher_connection_invalidated_cb (TpConnection  *connection,
-                                     guint          domain,
-                                     gint           code,
-                                     gchar         *message,
-                                     EmpathyDispatcher *dispatcher)
+dispatch_operation_approved_cb (EmpathyDispatchOperation *operation,
+                                EmpathyDispatcher *dispatcher)
 {
-       EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
-       GHashTableIter         iter;
-       gpointer               key, value;
-
-       DEBUG ("Error: %s", message);
-
-       g_hash_table_iter_init (&iter, priv->connections);
-       while (g_hash_table_iter_next (&iter, &key, &value)) {
-               if (value == connection) {
-                       g_hash_table_remove (priv->connections, key);
-                       break;
-               }
-       }
+  g_assert (empathy_dispatch_operation_is_incoming (operation));
+  DEBUG ("Send of for dispatching: %s",
+    empathy_dispatch_operation_get_object_path (operation));
+  g_signal_emit (dispatcher, signals[DISPATCH], 0, operation);
 }
 
-typedef struct
+static void
+dispatch_operation_claimed_cb (EmpathyDispatchOperation *operation,
+                               EmpathyDispatcher *dispatcher)
 {
-  EmpathyDispatcher *self;
-  EmpathyChatroom *chatroom;
-} dispatcher_connection_invalidated_cb_ctx;
+  /* Our job is done, remove the dispatch operation and mark the channel as
+   * dispatched */
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  TpConnection *connection;
+  ConnectionData *cd;
+  const gchar *object_path;
 
-static dispatcher_connection_invalidated_cb_ctx *
-dispatcher_connection_invalidated_cb_ctx_new (EmpathyDispatcher *dispatcher,
-                                              EmpathyChatroom *chatroom)
-{
-  dispatcher_connection_invalidated_cb_ctx *ctx;
+  connection = empathy_dispatch_operation_get_tp_connection (operation);
+  cd = g_hash_table_lookup (priv->connections, connection);
+  g_assert (cd != NULL);
 
-  ctx = g_slice_new (dispatcher_connection_invalidated_cb_ctx);
+  object_path = empathy_dispatch_operation_get_object_path (operation);
 
-  ctx->self = g_object_ref (dispatcher);
-  ctx->chatroom = g_object_ref (chatroom);
+  if (g_hash_table_lookup (cd->dispatched_channels, object_path) == NULL)
+    {
+      DispatchData *d;
+      d = new_dispatch_data (
+        empathy_dispatch_operation_get_channel (operation),
+        empathy_dispatch_operation_get_channel_wrapper (operation));
+      g_hash_table_insert (cd->dispatched_channels,
+        g_strdup (object_path), d);
+    }
+  g_hash_table_remove (cd->dispatching_channels, object_path);
 
-  return ctx;
+  DEBUG ("Channel claimed: %s", object_path);
 }
 
 static void
-dispatcher_connection_invalidated_cb_ctx_free (
-    dispatcher_connection_invalidated_cb_ctx *ctx)
+dispatch_operation_ready_cb (EmpathyDispatchOperation *operation,
+                             EmpathyDispatcher *dispatcher)
 {
-  g_object_unref (ctx->self);
-  g_object_unref (ctx->chatroom);
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  TpConnection *connection;
+  ConnectionData *cd;
+  EmpathyDispatchOperationState status;
+
+  g_signal_connect (operation, "approved",
+    G_CALLBACK (dispatch_operation_approved_cb), dispatcher);
+
+  g_signal_connect (operation, "claimed",
+    G_CALLBACK (dispatch_operation_claimed_cb), dispatcher);
+
+  /* Signal the observers */
+  DEBUG ("Send to observers: %s",
+    empathy_dispatch_operation_get_object_path (operation));
+  g_signal_emit (dispatcher, signals[OBSERVE], 0, operation);
+
+  empathy_dispatch_operation_start (operation);
+
+  /* Signal potential requestors */
+  connection =  empathy_dispatch_operation_get_tp_connection (operation);
+  cd = g_hash_table_lookup (priv->connections, connection);
+  g_assert (cd != NULL);
+
+  g_object_ref (operation);
+  g_object_ref (dispatcher);
+
+  dispatch_operation_flush_requests (dispatcher, operation, NULL, cd);
+  status = empathy_dispatch_operation_get_status (operation);
+  g_object_unref (operation);
+
+  if (status == EMPATHY_DISPATCHER_OPERATION_STATE_CLAIMED)
+    return;
+
+  if (status == EMPATHY_DISPATCHER_OPERATION_STATE_APPROVING)
+    {
+      DEBUG ("Send to approvers: %s",
+        empathy_dispatch_operation_get_object_path (operation));
+      g_signal_emit (dispatcher, signals[APPROVE], 0, operation);
+    }
+  else
+    {
+      g_assert (status == EMPATHY_DISPATCHER_OPERATION_STATE_DISPATCHING);
+      DEBUG ("Send of for dispatching: %s",
+        empathy_dispatch_operation_get_object_path (operation));
+      g_signal_emit (dispatcher, signals[DISPATCH], 0, operation);
+    }
 
-  g_slice_free (dispatcher_connection_invalidated_cb_ctx, ctx);
+  g_object_unref (dispatcher);
 }
 
-static void dispatcher_chatroom_invalidated_cb (
-    TpProxy *channel,
-    guint domain,
-    gint code,
-    gchar *message,
-    dispatcher_connection_invalidated_cb_ctx *ctx)
+static void
+dispatcher_start_dispatching (EmpathyDispatcher *self,
+                              EmpathyDispatchOperation *operation,
+                              ConnectionData *cd)
 {
-  EmpathyDispatcherPriv *priv = GET_PRIV (ctx->self);
-  gboolean favorite;
+  const gchar *object_path =
+    empathy_dispatch_operation_get_object_path (operation);
 
-  g_object_get (ctx->chatroom, "favorite", &favorite, NULL);
+  DEBUG ("Dispatching process started for %s", object_path);
 
-  if (favorite)
+  if (g_hash_table_lookup (cd->dispatching_channels, object_path) == NULL)
     {
-      /* Chatroom is in favorites so don't remove it from the manager */
-      g_object_set (ctx->chatroom, "tp-channel", NULL, NULL);
+      g_assert (g_hash_table_lookup (cd->outstanding_channels,
+        object_path) == NULL);
+
+      g_hash_table_insert (cd->dispatching_channels,
+        g_strdup (object_path), operation);
+
+      switch (empathy_dispatch_operation_get_status (operation))
+        {
+          case EMPATHY_DISPATCHER_OPERATION_STATE_PREPARING:
+            g_signal_connect (operation, "ready",
+              G_CALLBACK (dispatch_operation_ready_cb), dispatcher);
+            break;
+          case EMPATHY_DISPATCHER_OPERATION_STATE_PENDING:
+            dispatch_operation_ready_cb (operation, dispatcher);
+            break;
+          default:
+            g_assert_not_reached();
+        }
+
     }
-  else
+  else if (empathy_dispatch_operation_get_status (operation) >=
+      EMPATHY_DISPATCHER_OPERATION_STATE_PENDING)
     {
-      empathy_chatroom_manager_remove (priv->chatroom_mgr, ctx->chatroom);
+      /* Already dispatching and the operation is pending, thus the observers
+       * have seen it (if applicable), so we can flush the request right away.
+       */
+      dispatch_operation_flush_requests (self, operation, NULL, cd);
     }
 }
 
 static void
-dispatcher_connection_new_channel_cb (TpConnection *connection,
-                                     const gchar  *object_path,
-                                     const gchar  *channel_type,
-                                     guint         handle_type,
-                                     guint         handle,
-                                     gboolean      suppress_handler,
-                                     gpointer      user_data,
-                                     GObject      *object)
+dispatcher_flush_outstanding_operations (EmpathyDispatcher *self,
+                                         ConnectionData *cd)
 {
-       EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (object);
-  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
-       TpChannel         *channel;
-       gpointer           had_channels;
-
-       had_channels = g_object_get_data (G_OBJECT (connection), "had-channels");
-       if (had_channels == NULL) {
-               /* ListChannels didn't return yet, return to avoid duplicate
-                * dispatching */
-               return;
-       }
-
-       channel = tp_channel_new (connection, object_path, channel_type,
-                                 handle_type, handle, NULL);
-       tp_channel_run_until_ready (channel, NULL, NULL);
-
-       if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TUBES)) {
-               dispatcher_tubes_handle_channel (dispatcher, channel);
-       }
-
-  if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT) &&
-      handle_type == TP_HANDLE_TYPE_ROOM)
+  GHashTableIter iter;
+  gpointer value;
+
+  g_hash_table_iter_init (&iter, cd->outstanding_channels);
+  while (g_hash_table_iter_next (&iter, NULL, &value))
     {
-      /* Add the chatroom to the chatroom manager */
-      EmpathyChatroom *chatroom;
-      GArray *handles;
-      gchar **room_ids;
-      MissionControl *mc;
-      McAccount *account;
-      dispatcher_connection_invalidated_cb_ctx *ctx;
-
-      handles = g_array_sized_new (FALSE, FALSE, sizeof (TpHandle), 1);
-      g_array_append_val (handles, handle);
-
-      tp_cli_connection_run_inspect_handles (connection, -1,
-          TP_HANDLE_TYPE_ROOM, handles, &room_ids, NULL, NULL);
-
-      mc = empathy_mission_control_new ();
-      account = mission_control_get_account_for_tpconnection (mc, connection,
-          NULL);
-
-      chatroom = empathy_chatroom_manager_find (priv->chatroom_mgr, account,
-          room_ids[0]);
-      if (chatroom == NULL)
+      EmpathyDispatchOperation *operation = EMPATHY_DISPATCH_OPERATION (value);
+
+      if (dispatcher_operation_can_start (self, operation, cd))
         {
-          chatroom = empathy_chatroom_new (account);
-          empathy_chatroom_set_name (chatroom, room_ids[0]);
-          empathy_chatroom_manager_add (priv->chatroom_mgr, chatroom);
+          dispatcher_start_dispatching (dispatcher, operation, cd);
+          g_hash_table_iter_remove (&iter);
         }
-      else
+    }
+}
+
+static void
+dispatcher_connection_new_channel (EmpathyDispatcher *dispatcher,
+                                   TpConnection *connection,
+                                   const gchar *object_path,
+                                   const gchar *channel_type,
+                                   guint handle_type,
+                                   guint handle,
+                                   GHashTable *properties,
+                                   gboolean incoming)
+{
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  TpChannel         *channel;
+  ConnectionData *cd;
+  EmpathyDispatchOperation *operation;
+  int i;
+  /* Channel types we never want to dispatch because they're either deprecated
+   * or can't sensibly be dispatch (e.g. channels that should always be
+   * requested) */
+  const char *blacklist[] = {
+    TP_IFACE_CHANNEL_TYPE_CONTACT_LIST,
+    TP_IFACE_CHANNEL_TYPE_TUBES,
+    TP_IFACE_CHANNEL_TYPE_ROOM_LIST,
+    NULL
+  };
+
+  cd = g_hash_table_lookup (priv->connections, connection);
+
+  /* Don't bother with channels we have already dispatched or are dispatching
+   * currently. This can happen when NewChannel(s) is fired after
+   * RequestChannel/CreateChannel/EnsureChannel */
+  if (g_hash_table_lookup (cd->dispatched_channels, object_path) != NULL)
+    return;
+
+  if (g_hash_table_lookup (cd->dispatching_channels, object_path) != NULL)
+    return;
+
+  /* Should never occur, but just in case a CM fires spurious NewChannel(s) 
+   * signals */
+  if (g_hash_table_lookup (cd->outstanding_channels, object_path) != NULL)
+    return;
+
+  /* Only pick up non-requested text and file channels. For all other it
+   * doesn't make sense to handle it if we didn't request it. The same goes
+   * for channels we discovered by the Channels property or ListChannels */
+  if (!incoming && tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT)
+        && tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
+    {
+      DEBUG ("Ignoring incoming channel of type %s on %s",
+        channel_type, object_path);
+      return;
+    }
+
+  for (i = 0 ; blacklist[i] != NULL; i++)
+    {
+      if (!tp_strdiff (channel_type, blacklist[i]))
         {
-          g_object_ref (chatroom);
+          DEBUG ("Ignoring blacklisted channel type %s on %s",
+            channel_type, object_path);
+          return;
         }
+    }
 
-      g_object_set (chatroom, "tp-channel", channel, NULL);
+  DEBUG ("New channel of type %s on %s", channel_type, object_path);
 
-      ctx = dispatcher_connection_invalidated_cb_ctx_new (dispatcher, chatroom);
+  if (properties == NULL)
+    channel = tp_channel_new (connection, object_path, channel_type,
+      handle_type, handle, NULL);
+  else
+    channel = tp_channel_new_from_properties (connection, object_path,
+      properties, NULL);
+
+  g_signal_connect (channel, "invalidated",
+    G_CALLBACK (dispatcher_channel_invalidated_cb),
+    dispatcher);
+
+  priv->channels = g_list_prepend (priv->channels, channel);
 
-      g_signal_connect_data (channel, "invalidated",
-          G_CALLBACK (dispatcher_chatroom_invalidated_cb), ctx,
-          (GClosureNotify) dispatcher_connection_invalidated_cb_ctx_free, 0);
+  operation = empathy_dispatch_operation_new (connection, channel, NULL,
+    incoming);
 
-      g_free (room_ids[0]);
-      g_free (room_ids);
-      g_array_free (handles, TRUE);
-      g_object_unref (mc);
-      g_object_unref (account);
-      g_object_unref (chatroom);
+  g_object_unref (channel);
+
+  if (incoming)
+    {
+      /* Request could either be by us or by a remote party. If there are no
+       * outstanding requests for this channel type we can assume it's remote.
+       * Otherwise we wait untill they are all satisfied */
+      if (dispatcher_operation_can_start (dispatcher, operation, cd))
+        dispatcher_start_dispatching (dispatcher, operation, cd);
+      else
+        g_hash_table_insert (cd->outstanding_channels,
+          g_strdup (object_path), operation);
     }
+  else
+    {
+      dispatcher_start_dispatching (dispatcher, operation, cd);
+    }
+}
 
-       if (suppress_handler) {
-               g_signal_emit (dispatcher, signals[DISPATCH_CHANNEL], 0, channel);
-       } else {
-               g_signal_emit (dispatcher, signals[FILTER_CHANNEL], 0, channel);
-       }
+static void
+dispatcher_connection_new_channel_cb (TpConnection *connection,
+                                      const gchar *object_path,
+                                      const gchar  *channel_type,
+                                      guint handle_type,
+                                      guint handle,
+                                      gboolean suppress_handler,
+                                      gpointer user_data,
+                                      GObject *object)
+{
+  EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (object);
+
+  /* Empathy heavily abuses surpress handler (don't try this at home), if
+   * surpress handler is true then it is an outgoing channel, which is
+   * requested either by us or some other party (like the megaphone applet).
+   * Otherwise it's an incoming channel */
+  dispatcher_connection_new_channel (dispatcher, connection,
+    object_path, channel_type, handle_type, handle, NULL, !suppress_handler);
+}
 
-       g_object_unref (channel);
+static void
+dispatcher_connection_new_channel_with_properties (EmpathyDispatcher *dispatcher,
+                                                   TpConnection *connection,
+                                                   const gchar *object_path,
+                                                   GHashTable *properties)
+{
+  const gchar *channel_type;
+  guint handle_type;
+  guint handle;
+  gboolean requested;
+  gboolean valid;
+
+
+  channel_type = tp_asv_get_string (properties,
+    TP_IFACE_CHANNEL ".ChannelType");
+  if (channel_type == NULL)
+    {
+      g_message ("%s had an invalid ChannelType property", object_path);
+      return;
+    }
+
+  handle_type = tp_asv_get_uint32 (properties,
+    TP_IFACE_CHANNEL ".TargetHandleType", &valid);
+  if (!valid)
+    {
+      g_message ("%s had an invalid TargetHandleType property", object_path);
+      return;
+    }
+
+  handle = tp_asv_get_uint32 (properties,
+    TP_IFACE_CHANNEL ".TargetHandle", &valid);
+  if (!valid)
+    {
+      g_message ("%s had an invalid TargetHandle property", object_path);
+      return;
+    }
+
+  /* We assume there is no channel dispather, so we're the only one dispatching
+   * it. Which means that a requested channel it is outgoing one */
+  requested = tp_asv_get_boolean (properties,
+    TP_IFACE_CHANNEL ".Requested", &valid);
+  if (!valid)
+    {
+      g_message ("%s had an invalid Requested property", object_path);
+      return;
+    }
+
+  dispatcher_connection_new_channel (dispatcher, connection,
+    object_path, channel_type, handle_type, handle, properties, !requested);
 }
 
 static void
-dispatcher_connection_list_channels_cb (TpConnection    *connection,
-                                       const GPtrArray *channels,
-                                       const GError    *error,
-                                       gpointer         user_data,
-                                       GObject         *dispatcher)
+dispatcher_connection_new_channels_cb (TpConnection *connection,
+                                       const GPtrArray *channels,
+                                       gpointer user_data,
+                                       GObject *object)
 {
-       guint i;
-
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-               return;
-       }
-
-       g_object_set_data (G_OBJECT (connection), "had-channels",
-                          GUINT_TO_POINTER (1));
-
-       for (i = 0; i < channels->len; i++) {
-               GValueArray *values;
-
-               values = g_ptr_array_index (channels, i);
-               dispatcher_connection_new_channel_cb (connection,
-                       g_value_get_boxed (g_value_array_get_nth (values, 0)),
-                       g_value_get_string (g_value_array_get_nth (values, 1)),
-                       g_value_get_uint (g_value_array_get_nth (values, 2)),
-                       g_value_get_uint (g_value_array_get_nth (values, 3)),
-                       FALSE, user_data, dispatcher);
-       }
+  EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (object);
+  int i;
+
+  for (i = 0; i < channels->len ; i++)
+    {
+      GValueArray *arr = g_ptr_array_index (channels, i);
+      const gchar *object_path;
+      GHashTable *properties;
+
+      object_path = g_value_get_boxed (g_value_array_get_nth (arr, 0));
+      properties = g_value_get_boxed (g_value_array_get_nth (arr, 1));
+
+      dispatcher_connection_new_channel_with_properties (dispatcher,
+        connection, object_path, properties);
+    }
 }
 
 static void
-dispatcher_connection_advertise_capabilities_cb (TpConnection    *connection,
-                                                const GPtrArray *capabilities,
-                                                const GError    *error,
-                                                gpointer         user_data,
-                                                GObject         *dispatcher)
+dispatcher_connection_got_all (TpProxy *proxy,
+                               GHashTable *properties,
+                               const GError *error,
+                               gpointer user_data,
+                               GObject *object)
 {
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-       }
+  EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (object);
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  GPtrArray *channels;
+  GPtrArray *requestable_channels;
+
+  if (error) {
+    DEBUG ("Error: %s", error->message);
+    return;
+  }
+
+  channels = tp_asv_get_boxed (properties, "Channels",
+    TP_ARRAY_TYPE_CHANNEL_DETAILS_LIST);
+
+  if (channels == NULL)
+    DEBUG ("No Channels property !?! on connection");
+  else
+    dispatcher_connection_new_channels_cb (TP_CONNECTION (proxy),
+      channels, NULL, object);
+
+  requestable_channels = tp_asv_get_boxed (properties,
+    "RequestableChannelClasses", TP_ARRAY_TYPE_REQUESTABLE_CHANNEL_CLASS_LIST);
+
+  if (requestable_channels == NULL)
+    DEBUG ("No RequestableChannelClasses property !?! on connection");
+  else
+    {
+      ConnectionData *cd;
+
+      cd = g_hash_table_lookup (priv->connections, proxy);
+      g_assert (cd != NULL);
+
+      cd->requestable_channels = g_boxed_copy (
+        TP_ARRAY_TYPE_REQUESTABLE_CHANNEL_CLASS_LIST, requestable_channels);
+    }
 }
 
 static void
-dispatcher_connection_ready_cb (TpConnection  *connection,
-                               const GError  *error,
-                               gpointer       dispatcher)
+dispatcher_connection_list_channels_cb (TpConnection    *connection,
+                                        const GPtrArray *channels,
+                                        const GError    *error,
+                                        gpointer         user_data,
+                                        GObject         *dispatcher)
 {
-       GPtrArray   *capabilities;
-       GType        cap_type;
-       GValue       cap = {0, };
-       const gchar *remove = NULL;
-
-       if (error) {
-               dispatcher_connection_invalidated_cb (connection,
-                                                     error->domain,
-                                                     error->code,
-                                                     error->message,
-                                                     dispatcher);
-               return;
-       }
-
-       g_signal_connect (connection, "invalidated",
-                         G_CALLBACK (dispatcher_connection_invalidated_cb),
-                         dispatcher);
-       tp_cli_connection_connect_to_new_channel (connection,
-                                                 dispatcher_connection_new_channel_cb,
-                                                 NULL, NULL,
-                                                 G_OBJECT (dispatcher), NULL);
-       tp_cli_connection_call_list_channels (connection, -1,
-                                             dispatcher_connection_list_channels_cb,
-                                             NULL, NULL,
-                                             G_OBJECT (dispatcher));
-
-       /* Advertise VoIP capabilities */
-       capabilities = g_ptr_array_sized_new (1);
-       cap_type = dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING,
-                                          G_TYPE_UINT, G_TYPE_INVALID);
-       g_value_init (&cap, cap_type);
-       g_value_take_boxed (&cap, dbus_g_type_specialized_construct (cap_type));
-       dbus_g_type_struct_set (&cap,
-                               0, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-                               1, TP_CHANNEL_MEDIA_CAPABILITY_AUDIO |
-                                  TP_CHANNEL_MEDIA_CAPABILITY_VIDEO |
-                                  TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN  |
-                                  TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_GTALK_P2P,
-                               G_MAXUINT);
-       g_ptr_array_add (capabilities, g_value_get_boxed (&cap));
-
-       tp_cli_connection_interface_capabilities_call_advertise_capabilities (
-               connection, -1,
-               capabilities, &remove,
-               dispatcher_connection_advertise_capabilities_cb,
-               NULL, NULL, G_OBJECT (dispatcher));
-       /* FIXME: Is that leaked? */
+  int i;
+
+  if (error)
+    {
+      DEBUG ("Error: %s", error->message);
+      return;
+    }
+
+  for (i = 0; i < channels->len; i++)
+    {
+      GValueArray *values;
+
+      values = g_ptr_array_index (channels, i);
+      /* We don't have any extra info, so assume already existing channels are
+       * incoming... */
+      dispatcher_connection_new_channel (EMPATHY_DISPATCHER (dispatcher),
+        connection,
+        g_value_get_boxed (g_value_array_get_nth (values, 0)),
+        g_value_get_string (g_value_array_get_nth (values, 1)),
+        g_value_get_uint (g_value_array_get_nth (values, 2)),
+        g_value_get_uint (g_value_array_get_nth (values, 3)),
+        NULL, TRUE);
+    }
 }
 
 static void
-dispatcher_update_account (EmpathyDispatcher *dispatcher,
-                          McAccount         *account)
+dispatcher_connection_advertise_capabilities_cb (TpConnection    *connection,
+                                                 const GPtrArray *capabilities,
+                                                 const GError    *error,
+                                                 gpointer         user_data,
+                                                 GObject         *dispatcher)
 {
-       EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
-       TpConnection          *connection;
-
-       connection = g_hash_table_lookup (priv->connections, account);
-       if (connection) {
-               return;
-       }
-
-       connection = mission_control_get_tpconnection (priv->mc, account, NULL);
-       if (!connection) {
-               return;
-       }
-
-       g_hash_table_insert (priv->connections, g_object_ref (account), connection);
-       tp_connection_call_when_ready (connection,
-                                      dispatcher_connection_ready_cb,
-                                      dispatcher);
+  if (error)
+    DEBUG ("Error: %s", error->message);
 }
 
 static void
-dispatcher_status_changed_cb (MissionControl           *mc,
-                             TpConnectionStatus        status,
-                             McPresence                presence,
-                             TpConnectionStatusReason  reason,
-                             const gchar              *unique_name,
-                             EmpathyDispatcher            *dispatcher)
+dispatcher_new_connection_cb (EmpathyAccountManager *manager,
+                              TpConnection *connection,
+                              EmpathyDispatcher *dispatcher)
+{
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  GPtrArray   *capabilities;
+  GType        cap_type;
+  GValue       cap = {0, };
+  const gchar *remove = NULL;
+
+  if (g_hash_table_lookup (priv->connections, connection) != NULL)
+    return;
+
+  g_hash_table_insert (priv->connections, g_object_ref (connection),
+    new_connection_data ());
+
+  g_signal_connect (connection, "invalidated",
+    G_CALLBACK (dispatcher_connection_invalidated_cb), dispatcher);
+
+  if (tp_proxy_has_interface_by_id (TP_PROXY (connection),
+      TP_IFACE_QUARK_CONNECTION_INTERFACE_REQUESTS))
+    {
+      tp_cli_connection_interface_requests_connect_to_new_channels (connection,
+        dispatcher_connection_new_channels_cb,
+        NULL, NULL, G_OBJECT (dispatcher), NULL);
+
+      tp_cli_dbus_properties_call_get_all (connection, -1,
+        TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
+        dispatcher_connection_got_all,
+        NULL, NULL, G_OBJECT (dispatcher));
+    }
+  else
+    {
+      tp_cli_connection_connect_to_new_channel (connection,
+        dispatcher_connection_new_channel_cb,
+        NULL, NULL, G_OBJECT (dispatcher), NULL);
+
+      tp_cli_connection_call_list_channels (connection, -1,
+        dispatcher_connection_list_channels_cb, NULL, NULL,
+        G_OBJECT (dispatcher));
+
+    }
+
+  /* Advertise VoIP capabilities */
+  capabilities = g_ptr_array_sized_new (1);
+  cap_type = dbus_g_type_get_struct ("GValueArray", G_TYPE_STRING,
+    G_TYPE_UINT, G_TYPE_INVALID);
+  g_value_init (&cap, cap_type);
+  g_value_take_boxed (&cap, dbus_g_type_specialized_construct (cap_type));
+  dbus_g_type_struct_set (&cap,
+        0, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
+        1, TP_CHANNEL_MEDIA_CAPABILITY_AUDIO |
+           TP_CHANNEL_MEDIA_CAPABILITY_VIDEO |
+           TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_STUN  |
+           TP_CHANNEL_MEDIA_CAPABILITY_NAT_TRAVERSAL_GTALK_P2P, G_MAXUINT);
+  g_ptr_array_add (capabilities, g_value_get_boxed (&cap));
+
+  tp_cli_connection_interface_capabilities_call_advertise_capabilities (
+    connection, -1, capabilities, &remove,
+    dispatcher_connection_advertise_capabilities_cb,
+    NULL, NULL, G_OBJECT (dispatcher));
+
+  g_value_unset (&cap);
+  g_ptr_array_free (capabilities, TRUE);
+}
+
+static GObject*
+dispatcher_constructor (GType type,
+                        guint n_construct_params,
+                        GObjectConstructParam *construct_params)
 {
-       McAccount *account;
+  GObject *retval;
+
+  if (dispatcher == NULL)
+    {
+      retval = G_OBJECT_CLASS (empathy_dispatcher_parent_class)->constructor
+          (type, n_construct_params, construct_params);
+
+      dispatcher = EMPATHY_DISPATCHER (retval);
+      g_object_add_weak_pointer (retval, (gpointer) &dispatcher);
+    }
+  else
+    {
+      retval = g_object_ref (dispatcher);
+    }
 
-       account = mc_account_lookup (unique_name);
-       dispatcher_update_account (dispatcher, account);
-       g_object_unref (account);
+  return retval;
 }
 
 static void
 dispatcher_finalize (GObject *object)
 {
-       EmpathyDispatcherPriv *priv = GET_PRIV (object);
-       GSList                *l;
+  EmpathyDispatcherPriv *priv = GET_PRIV (object);
+  GList *l;
+  GHashTableIter iter;
+  gpointer connection;
+
+  g_signal_handlers_disconnect_by_func (priv->account_manager,
+      dispatcher_new_connection_cb, object);
+
+  for (l = priv->channels; l; l = l->next)
+    {
+      g_signal_handlers_disconnect_by_func (l->data,
+          dispatcher_channel_invalidated_cb, object);
+    }
 
-       empathy_disconnect_account_status_changed (priv->token);
-       g_object_unref (priv->mc);
+  g_list_free (priv->channels);
 
-       for (l = priv->tubes; l; l = l->next) {
-               g_signal_handlers_disconnect_by_func (l->data,
-                                                     dispatcher_tubes_channel_invalidated_cb,
-                                                     object);
-               g_object_unref (l->data);
-       }
-       g_slist_free (priv->tubes);
+  g_hash_table_iter_init (&iter, priv->connections);
+  while (g_hash_table_iter_next (&iter, &connection, NULL))
+    {
+      g_signal_handlers_disconnect_by_func (connection,
+          dispatcher_connection_invalidated_cb, object);
+    }
 
-       g_hash_table_destroy (priv->connections);
+  g_object_unref (priv->account_manager);
+  g_object_unref (priv->mc);
 
-  g_object_unref (priv->chatroom_mgr);
+  g_hash_table_destroy (priv->connections);
 }
 
 static void
 empathy_dispatcher_class_init (EmpathyDispatcherClass *klass)
 {
-       GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-       object_class->finalize = dispatcher_finalize;
-
-       signals[DISPATCH_CHANNEL] =
-               g_signal_new ("dispatch-channel",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             1, TP_TYPE_CHANNEL);
-       signals[FILTER_CHANNEL] =
-               g_signal_new ("filter-channel",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__OBJECT,
-                             G_TYPE_NONE,
-                             1, TP_TYPE_CHANNEL);
-       signals[FILTER_TUBE] =
-               g_signal_new ("filter-tube",
-                             G_TYPE_FROM_CLASS (klass),
-                             G_SIGNAL_RUN_LAST,
-                             0,
-                             NULL, NULL,
-                             g_cclosure_marshal_VOID__BOXED,
-                             G_TYPE_NONE,
-                             1, EMPATHY_TYPE_DISPATCHER_TUBE);
-
-       g_type_class_add_private (object_class, sizeof (EmpathyDispatcherPriv));
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = dispatcher_finalize;
+  object_class->constructor = dispatcher_constructor;
+
+  signals[OBSERVE] =
+    g_signal_new ("observe",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST,
+      0,
+      NULL, NULL,
+      g_cclosure_marshal_VOID__OBJECT,
+      G_TYPE_NONE,
+      1, EMPATHY_TYPE_DISPATCH_OPERATION);
+
+  signals[APPROVE] =
+    g_signal_new ("approve",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST,
+      0,
+      NULL, NULL,
+      g_cclosure_marshal_VOID__OBJECT,
+      G_TYPE_NONE,
+      1, EMPATHY_TYPE_DISPATCH_OPERATION);
+
+  signals[DISPATCH] =
+    g_signal_new ("dispatch",
+      G_TYPE_FROM_CLASS (klass),
+      G_SIGNAL_RUN_LAST,
+      0,
+      NULL, NULL,
+      g_cclosure_marshal_VOID__OBJECT,
+      G_TYPE_NONE,
+      1, EMPATHY_TYPE_DISPATCH_OPERATION);
+
+  g_type_class_add_private (object_class, sizeof (EmpathyDispatcherPriv));
+
 }
 
 static void
 empathy_dispatcher_init (EmpathyDispatcher *dispatcher)
 {
-       GList                 *accounts, *l;
-       EmpathyDispatcherPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (dispatcher,
-               EMPATHY_TYPE_DISPATCHER, EmpathyDispatcherPriv);
-
-       dispatcher->priv = priv;
-       priv->mc = empathy_mission_control_new ();
-       priv->token = empathy_connect_to_account_status_changed (priv->mc,
-               G_CALLBACK (dispatcher_status_changed_cb),
-               dispatcher, NULL);
-
-       priv->connections = g_hash_table_new_full (empathy_account_hash,
-                                                  empathy_account_equal,
-                                                  g_object_unref,
-                                                  g_object_unref);
-       accounts = mc_accounts_list_by_enabled (TRUE);
-       for (l = accounts; l; l = l->next) {
-               dispatcher_update_account (dispatcher, l->data);
-               g_object_unref (l->data);
-       }
-       g_list_free (accounts);
-
-  priv->chatroom_mgr = empathy_chatroom_manager_new (NULL);
+  GList *connections, *l;
+  EmpathyDispatcherPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (dispatcher,
+    EMPATHY_TYPE_DISPATCHER, EmpathyDispatcherPriv);
+
+  dispatcher->priv = priv;
+  priv->mc = empathy_mission_control_dup_singleton ();
+  priv->account_manager = empathy_account_manager_dup_singleton ();
+
+  g_signal_connect (priv->account_manager, "new-connection",
+    G_CALLBACK (dispatcher_new_connection_cb),
+    dispatcher);
+
+  priv->connections = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+    g_object_unref, (GDestroyNotify) free_connection_data);
+
+  priv->channels = NULL;
+
+  connections = empathy_account_manager_dup_connections (priv->account_manager);
+  for (l = connections; l; l = l->next)
+    {
+      dispatcher_new_connection_cb (priv->account_manager, l->data, dispatcher);
+      g_object_unref (l->data);
+    }
+  g_list_free (connections);
 }
 
 EmpathyDispatcher *
-empathy_dispatcher_new (void)
+empathy_dispatcher_dup_singleton (void)
 {
-       if (!dispatcher) {
-               dispatcher = g_object_new (EMPATHY_TYPE_DISPATCHER, NULL);
-               g_object_add_weak_pointer (G_OBJECT (dispatcher), (gpointer) &dispatcher);
-       } else {
-               g_object_ref (dispatcher);
-       }
-
-       return dispatcher;
+  return EMPATHY_DISPATCHER (g_object_new (EMPATHY_TYPE_DISPATCHER, NULL));
 }
 
-typedef struct {
-       const gchar *channel_type;
-       guint        handle_type;
-       guint        handle;
-} DispatcherRequestData;
+static void
+dispatcher_request_failed (EmpathyDispatcher *dispatcher,
+                           DispatcherRequestData *request_data,
+                           const GError *error)
+{
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  ConnectionData *conn_data;
+
+  conn_data = g_hash_table_lookup (priv->connections, request_data->connection);
+  if (request_data->cb != NULL)
+    request_data->cb (NULL, error, request_data->user_data);
+
+  conn_data->outstanding_requests =
+      g_list_remove (conn_data->outstanding_requests, request_data);
+  free_dispatcher_request_data (request_data);
+}
 
 static void
-dispatcher_request_channel_cb (TpConnection *connection,
-                              const gchar  *object_path,
-                              const GError *error,
-                              gpointer      user_data,
-                              GObject      *weak_object)
+dispatcher_connection_new_requested_channel (EmpathyDispatcher *dispatcher,
+                                             DispatcherRequestData *request_data,
+                                             const gchar *object_path,
+                                             GHashTable *properties,
+                                             const GError *error)
 {
-       DispatcherRequestData *data = (DispatcherRequestData*) user_data;
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  EmpathyDispatchOperation *operation = NULL;
+  ConnectionData *conn_data;
+
+  conn_data = g_hash_table_lookup (priv->connections,
+    request_data->connection);
 
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-               return;
-       }
+  if (error)
+    {
+      DEBUG ("Channel request failed: %s", error->message);
+
+      dispatcher_request_failed (dispatcher, request_data, error);
+
+      goto out;
+    }
+
+  operation = g_hash_table_lookup (conn_data->outstanding_channels,
+    object_path);
 
-       if (dispatcher) {
-               TpChannel *channel;
+  if (operation != NULL)
+    g_hash_table_remove (conn_data->outstanding_channels, object_path);
+  else
+    operation = g_hash_table_lookup (conn_data->dispatching_channels,
+        object_path);
 
-               channel = tp_channel_new (connection, object_path,
-                                         data->channel_type,
-                                         data->handle_type,
-                                         data->handle, NULL);
+  if (operation == NULL)
+    {
+      DispatchData *data = g_hash_table_lookup (conn_data->dispatched_channels,
+        object_path);
 
-               g_signal_emit (dispatcher, signals[DISPATCH_CHANNEL], 0, channel);
-       }
+      if (data != NULL)
+        {
+          operation = empathy_dispatch_operation_new_with_wrapper (
+            request_data->connection,
+            data->channel, request_data->contact, FALSE,
+            data->channel_wrapper);
+        }
+      else
+        {
+          TpChannel *channel;
+
+          if (properties != NULL)
+            channel = tp_channel_new_from_properties (request_data->connection,
+              object_path, properties, NULL);
+          else
+            channel = tp_channel_new (request_data->connection, object_path,
+              request_data->channel_type, request_data->handle_type,
+              request_data->handle, NULL);
+
+          g_signal_connect (channel, "invalidated",
+            G_CALLBACK (dispatcher_channel_invalidated_cb),
+            request_data->dispatcher);
+
+          priv->channels = g_list_prepend (priv->channels, channel);
+
+          operation = empathy_dispatch_operation_new (request_data->connection,
+             channel, request_data->contact, FALSE);
+          g_object_unref (channel);
+        }
+    }
+  else
+    {
+      /* Already existed set potential extra information */
+      g_object_set (G_OBJECT (operation),
+        "contact", request_data->contact,
+        NULL);
+    }
+
+  request_data->operation = operation;
+
+  /* (pre)-approve this right away as we requested it
+   * This might cause the channel to be claimed, in which case the operation
+   * will disappear. So ref it, and check the status before starting the
+   * dispatching */
+
+  g_object_ref (operation);
+  empathy_dispatch_operation_approve (operation);
+
+   if (empathy_dispatch_operation_get_status (operation) <
+     EMPATHY_DISPATCHER_OPERATION_STATE_APPROVING)
+      dispatcher_start_dispatching (request_data->dispatcher, operation,
+          conn_data);
+
+  g_object_unref (operation);
+
+out:
+  dispatcher_flush_outstanding_operations (request_data->dispatcher,
+    conn_data);
+}
+
+static void
+dispatcher_request_channel_cb (TpConnection *connection,
+                               const gchar  *object_path,
+                               const GError *error,
+                               gpointer user_data,
+                               GObject *weak_object)
+{
+  EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (weak_object);
+  DispatcherRequestData *request_data = (DispatcherRequestData*) user_data;
+
+  dispatcher_connection_new_requested_channel (dispatcher,
+    request_data, object_path, NULL, error);
+}
+
+static void
+dispatcher_request_channel (DispatcherRequestData *request_data)
+{
+  tp_cli_connection_call_request_channel (request_data->connection, -1,
+    request_data->channel_type,
+    request_data->handle_type,
+    request_data->handle,
+    TRUE, dispatcher_request_channel_cb,
+    request_data, NULL, G_OBJECT (request_data->dispatcher));
 }
 
 void
-empathy_dispatcher_call_with_contact (EmpathyContact *contact)
+empathy_dispatcher_chat_with_contact (EmpathyContact *contact,
+                                      EmpathyDispatcherRequestCb *callback,
+                                      gpointer user_data)
 {
-       MissionControl        *mc;
-       McAccount             *account;
-       TpConnection          *connection;
-       gchar                 *object_path;
-       TpChannel             *channel;
-       EmpathyContactFactory *factory;
-       EmpathyTpGroup        *group;
-       EmpathyContact        *self_contact;
-       GError                *error = NULL;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-
-       mc = empathy_mission_control_new ();
-       account = empathy_contact_get_account (contact);
-       connection = mission_control_get_tpconnection (mc, account, NULL);
-       tp_connection_run_until_ready (connection, FALSE, NULL, NULL);
-       g_object_unref (mc);
-
-       /* We abuse of suppress_handler, TRUE means OUTGOING. The channel
-        * will be catched in EmpathyFilter */
-       if (!tp_cli_connection_run_request_channel (connection, -1,
-                                                   TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-                                                   TP_HANDLE_TYPE_NONE,
-                                                   0,
-                                                   TRUE,
-                                                   &object_path,
-                                                   &error,
-                                                   NULL)) {
-               DEBUG ("Couldn't request channel: %s",
-                       error ? error->message : "No error given");
-               g_clear_error (&error);
-               g_object_unref (connection);
-               return;
-       }
-
-       channel = tp_channel_new (connection,
-                                 object_path, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-                                 TP_HANDLE_TYPE_NONE, 0, NULL);
-
-       group = empathy_tp_group_new (channel);
-       empathy_run_until_ready (group);
-
-       factory = empathy_contact_factory_new ();
-       self_contact = empathy_contact_factory_get_user (factory, account);
-       empathy_contact_run_until_ready (self_contact,
-                                        EMPATHY_CONTACT_READY_HANDLE,
-                                        NULL);
-
-       empathy_tp_group_add_member (group, contact, "");
-       empathy_tp_group_add_member (group, self_contact, "");  
-
-       g_object_unref (factory);
-       g_object_unref (self_contact);
-       g_object_unref (group);
-       g_object_unref (connection);
-       g_object_unref (channel);
-       g_free (object_path);
+  EmpathyDispatcher *dispatcher;
+  EmpathyDispatcherPriv *priv;
+  TpConnection *connection;
+  ConnectionData *connection_data;
+  DispatcherRequestData *request_data;
+
+  g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+
+  dispatcher = empathy_dispatcher_dup_singleton();
+  priv = GET_PRIV (dispatcher);
+
+  connection = empathy_contact_get_connection (contact);
+  connection_data = g_hash_table_lookup (priv->connections, connection);
+
+  /* The contact handle might not be known yet */
+  request_data  = new_dispatcher_request_data (dispatcher, connection,
+    TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_CONTACT,
+    empathy_contact_get_handle (contact), NULL, contact, callback, user_data);
+
+  connection_data->outstanding_requests = g_list_prepend
+    (connection_data->outstanding_requests, request_data);
+
+  dispatcher_request_channel (request_data);
+
+  g_object_unref (dispatcher);
+}
+
+typedef struct
+{
+  EmpathyDispatcher *dispatcher;
+  EmpathyDispatcherRequestCb *callback;
+  gpointer user_data;
+} ChatWithContactIdData;
+
+static void
+dispatcher_chat_with_contact_id_cb (EmpathyTpContactFactory *factory,
+                                    EmpathyContact          *contact,
+                                    const GError            *error,
+                                    gpointer                 user_data,
+                                    GObject                 *weak_object)
+{
+  ChatWithContactIdData *data = user_data;
+
+  if (error)
+    {
+      /* FIXME: Should call data->callback with the error */
+      DEBUG ("Error: %s", error->message);
+    }
+  else
+    {
+      empathy_dispatcher_chat_with_contact (contact, data->callback, data->user_data);
+    }
+
+  g_object_unref (data->dispatcher);
+  g_slice_free (ChatWithContactIdData, data);
 }
 
 void
-empathy_dispatcher_call_with_contact_id (McAccount *account, const gchar *contact_id)
+empathy_dispatcher_chat_with_contact_id (TpConnection *connection,
+                                         const gchar *contact_id,
+                                         EmpathyDispatcherRequestCb *callback,
+                                         gpointer user_data)
 {
-       EmpathyContactFactory *factory;
-       EmpathyContact        *contact;
+  EmpathyDispatcher *dispatcher;
+  EmpathyTpContactFactory *factory;
+  ChatWithContactIdData *data;
+
+  g_return_if_fail (TP_IS_CONNECTION (connection));
+  g_return_if_fail (!EMP_STR_EMPTY (contact_id));
+
+  dispatcher = empathy_dispatcher_dup_singleton ();
+  factory = empathy_tp_contact_factory_dup_singleton (connection);
+  data = g_slice_new0 (ChatWithContactIdData);
+  data->dispatcher = dispatcher;
+  data->callback = callback;
+  data->user_data = user_data;
+  empathy_tp_contact_factory_get_from_id (factory, contact_id,
+      dispatcher_chat_with_contact_id_cb, data, NULL, NULL);
+
+  g_object_unref (factory);
+}
 
-       factory = empathy_contact_factory_new ();
-       contact = empathy_contact_factory_get_from_id (factory, account, contact_id);
-       empathy_contact_run_until_ready (contact, EMPATHY_CONTACT_READY_HANDLE, NULL);
+static void
+dispatcher_request_handles_cb (TpConnection *connection,
+                               const GArray *handles,
+                               const GError *error,
+                               gpointer user_data,
+                               GObject *object)
+{
+  DispatcherRequestData *request_data = (DispatcherRequestData *) user_data;
+
+  if (error != NULL)
+    {
+      EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (object);
+      EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+      ConnectionData *cd;
+
+      cd = g_hash_table_lookup (priv->connections, request_data->connection);
+
+      if (request_data->cb)
+        request_data->cb (NULL, error, request_data->user_data);
 
-       empathy_dispatcher_call_with_contact (contact);
+      cd->outstanding_requests = g_list_remove (cd->outstanding_requests,
+        request_data);
 
-       g_object_unref (contact);
-       g_object_unref (factory);
+      free_dispatcher_request_data (request_data);
+
+      dispatcher_flush_outstanding_operations (dispatcher, cd);
+      return;
+    }
+
+  request_data->handle = g_array_index (handles, guint, 0);
+  dispatcher_request_channel (request_data);
 }
 
 void
-empathy_dispatcher_chat_with_contact (EmpathyContact  *contact)
+empathy_dispatcher_join_muc (TpConnection *connection,
+                             const gchar *roomname,
+                             EmpathyDispatcherRequestCb *callback,
+                             gpointer user_data)
+{
+  EmpathyDispatcher *dispatcher;
+  EmpathyDispatcherPriv *priv;
+  DispatcherRequestData *request_data;
+  ConnectionData *connection_data;
+  const gchar *names[] = { roomname, NULL };
+
+  g_return_if_fail (TP_IS_CONNECTION (connection));
+  g_return_if_fail (!EMP_STR_EMPTY (roomname));
+
+  dispatcher = empathy_dispatcher_dup_singleton();
+  priv = GET_PRIV (dispatcher);
+
+  connection_data = g_hash_table_lookup (priv->connections, connection);
+
+  /* Don't know the room handle yet */
+  request_data  = new_dispatcher_request_data (dispatcher, connection,
+    TP_IFACE_CHANNEL_TYPE_TEXT, TP_HANDLE_TYPE_ROOM, 0, NULL,
+    NULL, callback, user_data);
+
+  connection_data->outstanding_requests = g_list_prepend
+    (connection_data->outstanding_requests, request_data);
+
+  tp_cli_connection_call_request_handles (connection, -1,
+    TP_HANDLE_TYPE_ROOM, names,
+    dispatcher_request_handles_cb, request_data, NULL,
+    G_OBJECT (dispatcher));
+
+  g_object_unref (dispatcher);
+}
+
+static void
+dispatcher_create_channel_cb (TpConnection *connect,
+                              const gchar *object_path,
+                              GHashTable *properties,
+                              const GError *error,
+                              gpointer user_data,
+                              GObject *weak_object)
 {
-       MissionControl        *mc;
-       McAccount             *account;
-       TpConnection          *connection;
-       DispatcherRequestData *data;
-
-       g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-
-       mc = empathy_mission_control_new ();
-       account = empathy_contact_get_account (contact);
-       connection = mission_control_get_tpconnection (mc, account, NULL);
-       tp_connection_run_until_ready (connection, FALSE, NULL, NULL);
-       g_object_unref (mc);
-
-       /* We abuse of suppress_handler, TRUE means OUTGOING. */
-       data = g_new (DispatcherRequestData, 1);
-       data->channel_type = TP_IFACE_CHANNEL_TYPE_TEXT;
-       data->handle_type = TP_HANDLE_TYPE_CONTACT;
-       data->handle = empathy_contact_get_handle (contact);
-       tp_cli_connection_call_request_channel (connection, -1,
-                                               data->channel_type,
-                                               data->handle_type,
-                                               data->handle,
-                                               TRUE,
-                                               dispatcher_request_channel_cb,
-                                               data, g_free,
-                                               NULL);
-       g_object_unref (connection);
+  EmpathyDispatcher *dispatcher = EMPATHY_DISPATCHER (weak_object);
+  DispatcherRequestData *request_data = (DispatcherRequestData*) user_data;
+
+  dispatcher_connection_new_requested_channel (dispatcher,
+    request_data, object_path, properties, error);
 }
 
 void
-empathy_dispatcher_chat_with_contact_id (McAccount   *account,
-                                        const gchar *contact_id)
+empathy_dispatcher_create_channel (EmpathyDispatcher *dispatcher,
+                                   TpConnection *connection,
+                                   GHashTable *request,
+                                   EmpathyDispatcherRequestCb *callback,
+                                   gpointer user_data)
 {
-       EmpathyContactFactory *factory;
-       EmpathyContact        *contact;
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  ConnectionData *connection_data;
+  DispatcherRequestData *request_data;
+  const gchar *channel_type;
+  guint handle_type;
+  guint handle;
+  gboolean valid;
+
+  g_return_if_fail (EMPATHY_IS_DISPATCHER (dispatcher));
+  g_return_if_fail (TP_IS_CONNECTION (connection));
+  g_return_if_fail (request != NULL);
+
+  connection_data = g_hash_table_lookup (priv->connections, connection);
+  g_assert (connection_data != NULL);
+
+  channel_type = tp_asv_get_string (request, TP_IFACE_CHANNEL ".ChannelType");
 
-       factory = empathy_contact_factory_new ();
-       contact = empathy_contact_factory_get_from_id (factory, account, contact_id);
-       empathy_contact_run_until_ready (contact, EMPATHY_CONTACT_READY_HANDLE, NULL);
+  handle_type = tp_asv_get_uint32 (request,
+    TP_IFACE_CHANNEL ".TargetHandleType", &valid);
+  if (!valid)
+    handle_type = TP_UNKNOWN_HANDLE_TYPE;
 
-       empathy_dispatcher_chat_with_contact (contact);
+  handle = tp_asv_get_uint32 (request, TP_IFACE_CHANNEL ".TargetHandle", NULL);
 
-       g_object_unref (contact);
-       g_object_unref (factory);
+  request_data  = new_dispatcher_request_data (dispatcher, connection,
+    channel_type, handle_type, handle, request,
+    NULL, callback, user_data);
+
+  connection_data->outstanding_requests = g_list_prepend
+    (connection_data->outstanding_requests, request_data);
+
+  tp_cli_connection_interface_requests_call_create_channel (
+    request_data->connection, -1,
+    request_data->request, dispatcher_create_channel_cb, request_data, NULL,
+    G_OBJECT (request_data->dispatcher));
 }
 
-EmpathyTpFile *
-empathy_dispatcher_send_file (EmpathyContact *contact,
-                             GFile          *gfile)
+void
+empathy_dispatcher_send_file_to_contact (EmpathyContact *contact,
+                                         const gchar *filename,
+                                         guint64 size,
+                                         guint64 date,
+                                         const gchar *content_type,
+                                         EmpathyDispatcherRequestCb *callback,
+                                         gpointer user_data)
 {
-       GFileInfo      *info;
-       guint64         size;
-       MissionControl *mc;
-       McAccount      *account;
-       TpConnection   *connection;
-       guint           handle;
-       gchar          *object_path;
-       TpChannel      *channel;
-       EmpathyTpFile  *tp_file;
-       GError         *error = NULL;
-       GValue          value = { 0 };
-       gchar          *filename;
-
-       g_return_val_if_fail (EMPATHY_IS_CONTACT (contact), NULL);
-       g_return_val_if_fail (G_IS_FILE (gfile), NULL);
-
-       info = g_file_query_info (gfile,
-                                 G_FILE_ATTRIBUTE_STANDARD_SIZE ","
-                                 G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
-                                 0, NULL, NULL);
-       size = info ? g_file_info_get_size (info) : EMPATHY_TP_FILE_UNKNOWN_SIZE;
-       filename = g_file_get_basename (gfile);
-       mc = empathy_mission_control_new ();
-       account = empathy_contact_get_account (contact);
-       connection = mission_control_get_tpconnection (mc, account, NULL);
-       tp_connection_run_until_ready (connection, FALSE, NULL, NULL);
-       handle = empathy_contact_get_handle (contact);
-
-       DEBUG ("Sending %s from a stream to %s (size %llu, content-type %s)",
-              filename, empathy_contact_get_name (contact), size,
-              g_file_info_get_content_type (info));
-
-       if (!tp_cli_connection_run_request_channel (connection, -1,
-                                                   EMP_IFACE_CHANNEL_TYPE_FILE,
-                                                   TP_HANDLE_TYPE_CONTACT,
-                                                   handle,
-                                                   TRUE,
-                                                   &object_path,
-                                                   &error,
-                                                   NULL)) {
-               DEBUG ("Couldn't request channel: %s",
-                      error ? error->message : "No error given");
-               g_clear_error (&error);
-               g_object_unref (mc);
-               g_object_unref (connection);
-               return NULL;
-       }
-
-       channel = tp_channel_new (connection,
-                                 object_path,
-                                 EMP_IFACE_CHANNEL_TYPE_FILE,
-                                 TP_HANDLE_TYPE_CONTACT,
-                                 handle,
-                                 NULL);
-
-       /* FIXME: this should go in CreateChannel in the new requests API */
-
-       g_value_init (&value, G_TYPE_STRING);
-       g_value_set_string (&value, g_filename_display_basename (filename));
-       tp_cli_dbus_properties_call_set (TP_PROXY (channel), -1,
-               EMP_IFACE_CHANNEL_TYPE_FILE, "Filename",
-               &value, NULL, NULL, NULL, NULL);
-       g_value_reset (&value);
-
-       g_value_set_string (&value, g_file_info_get_content_type (info));
-       tp_cli_dbus_properties_call_set (TP_PROXY (channel), -1,
-               EMP_IFACE_CHANNEL_TYPE_FILE, "ContentType",
-               &value, NULL, NULL, NULL, NULL);
-
-       g_value_unset (&value);
-
-       g_value_init (&value, G_TYPE_UINT64);
-       g_value_set_uint64 (&value, size);
-       tp_cli_dbus_properties_call_set (TP_PROXY (channel), -1,
-               EMP_IFACE_CHANNEL_TYPE_FILE, "Size",
-               &value, NULL, NULL, NULL, NULL);
-       g_value_unset (&value);
-
-       tp_file = empathy_tp_file_new (channel);
-
-       if (tp_file) {
-               empathy_tp_file_set_gfile (tp_file, gfile, NULL);
-       }
-
-       empathy_tp_file_offer (tp_file);
-
-       g_object_unref (mc);
-       g_object_unref (connection);
-       g_object_unref (channel);
-       g_free (object_path);
-
-       return tp_file;
+  EmpathyDispatcher *dispatcher = empathy_dispatcher_dup_singleton();
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  TpConnection *connection = empathy_contact_get_connection (contact);
+  ConnectionData *connection_data =
+    g_hash_table_lookup (priv->connections, connection);
+  DispatcherRequestData *request_data;
+  GValue *value;
+  GHashTable *request = g_hash_table_new_full (g_str_hash, g_str_equal, NULL,
+      (GDestroyNotify) tp_g_value_slice_free);
+
+  g_return_if_fail (EMPATHY_IS_CONTACT (contact));
+  g_return_if_fail (!EMP_STR_EMPTY (filename));
+  g_return_if_fail (!EMP_STR_EMPTY (content_type));
+
+  /* org.freedesktop.Telepathy.Channel.ChannelType */
+  value = tp_g_value_slice_new (G_TYPE_STRING);
+  g_value_set_string (value, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
+  g_hash_table_insert (request, TP_IFACE_CHANNEL ".ChannelType", value);
+
+  /* org.freedesktop.Telepathy.Channel.TargetHandleType */
+  value = tp_g_value_slice_new (G_TYPE_UINT);
+  g_value_set_uint (value, TP_HANDLE_TYPE_CONTACT);
+  g_hash_table_insert (request, TP_IFACE_CHANNEL ".TargetHandleType", value);
+
+  /* org.freedesktop.Telepathy.Channel.TargetHandle */
+  value = tp_g_value_slice_new (G_TYPE_UINT);
+  g_value_set_uint (value, empathy_contact_get_handle (contact));
+  g_hash_table_insert (request, TP_IFACE_CHANNEL ".TargetHandle", value);
+
+  /* org.freedesktop.Telepathy.Channel.Type.FileTransfer.ContentType */
+  value = tp_g_value_slice_new (G_TYPE_STRING);
+  g_value_set_string (value, content_type);
+  g_hash_table_insert (request,
+    TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentType", value);
+
+  /* org.freedesktop.Telepathy.Channel.Type.FileTransfer.Filename */
+  value = tp_g_value_slice_new (G_TYPE_STRING);
+  g_value_set_string (value, filename);
+  g_hash_table_insert (request,
+    TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Filename", value);
+
+  /* org.freedesktop.Telepathy.Channel.Type.FileTransfer.Size */
+  value = tp_g_value_slice_new (G_TYPE_UINT64);
+  g_value_set_uint64 (value, size);
+  g_hash_table_insert (request,
+    TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Size", value);
+
+  /* org.freedesktop.Telepathy.Channel.Type.FileTransfer.Date */
+  value = tp_g_value_slice_new (G_TYPE_UINT64);
+  g_value_set_uint64 (value, date);
+  g_hash_table_insert (request,
+    TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Date", value);
+
+  request_data = new_dispatcher_request_data (dispatcher, connection,
+    TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, TP_HANDLE_TYPE_CONTACT,
+    empathy_contact_get_handle (contact), request, contact, callback,
+    user_data);
+  connection_data->outstanding_requests = g_list_prepend
+    (connection_data->outstanding_requests, request_data);
+
+  tp_cli_connection_interface_requests_call_create_channel (
+    request_data->connection, -1,
+    request_data->request, dispatcher_create_channel_cb, request_data, NULL,
+    G_OBJECT (request_data->dispatcher));
+
+  g_object_unref (dispatcher);
 }
+
+GStrv
+empathy_dispatcher_find_channel_class (EmpathyDispatcher *dispatcher,
+                                       TpConnection *connection,
+                                       const gchar *channel_type,
+                                       guint handle_type)
+{
+  EmpathyDispatcherPriv *priv = GET_PRIV (dispatcher);
+  ConnectionData *cd;
+  int i;
+  GPtrArray *classes;
+
+  g_return_val_if_fail (channel_type != NULL, NULL);
+  g_return_val_if_fail (handle_type != 0, NULL);
+
+  cd = g_hash_table_lookup (priv->connections, connection);
+
+  if (cd == NULL)
+    return NULL;
+
+  classes = cd->requestable_channels;
+  if (classes == NULL)
+    return NULL;
+
+  for (i = 0; i < classes->len; i++)
+    {
+      GValueArray *class;
+      GValue *fixed;
+      GValue *allowed;
+      GHashTable *fprops;
+      const gchar *c_type;
+      guint32 h_type;
+      gboolean valid;
+
+      class = g_ptr_array_index (classes, i);
+      fixed = g_value_array_get_nth (class, 0);
+
+      fprops = g_value_get_boxed (fixed);
+      c_type = tp_asv_get_string (fprops, TP_IFACE_CHANNEL ".ChannelType");
+
+      if (tp_strdiff (channel_type, c_type))
+        continue;
+
+      h_type = tp_asv_get_uint32 (fprops,
+        TP_IFACE_CHANNEL ".TargetHandleType", &valid);
+
+      if (!valid || handle_type != h_type)
+        continue;
+
+      allowed = g_value_array_get_nth (class, 1);
+
+      return g_value_get_boxed (allowed);
+    }
+
+  return NULL;
+}
+