]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-tp-contact-factory.c
Updated Polish translation
[empathy.git] / libempathy / empathy-tp-contact-factory.c
index 7bdfaed890e156b601a14c8c3dd5946b8e5e6845..4d5a7295e665a40bfc5a62e2d666728e89ef43e3 100644 (file)
@@ -1,6 +1,6 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2007-2008 Collabora Ltd.
+ * Copyright (C) 2007-2009 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,7 +15,7 @@
  * 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: Xavier Claessens <xclaesse@gmail.com>
  */
 
 #include <string.h>
 
 #include <telepathy-glib/util.h>
-#include <telepathy-glib/connection.h>
-#include <libmissioncontrol/mission-control.h>
+#include <telepathy-glib/gtypes.h>
+#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/interfaces.h>
+
+#if HAVE_GEOCLUE
+#include <geoclue/geoclue-geocode.h>
+#endif
+
+#include <extensions/extensions.h>
 
 #include "empathy-tp-contact-factory.h"
 #include "empathy-utils.h"
-#include "empathy-debug.h"
+#include "empathy-location.h"
 
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-                      EMPATHY_TYPE_TP_CONTACT_FACTORY, EmpathyTpContactFactoryPriv))
-
-#define DEBUG_DOMAIN "TpContactFactory"
+#define DEBUG_FLAG EMPATHY_DEBUG_TP | EMPATHY_DEBUG_CONTACT
+#include "empathy-debug.h"
 
-struct _EmpathyTpContactFactoryPriv {
-       MissionControl *mc;
-       McAccount      *account;
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTpContactFactory)
+typedef struct {
        TpConnection   *connection;
-       gboolean        ready;
-
        GList          *contacts;
-       EmpathyContact *user;
-};
 
-static void empathy_tp_contact_factory_class_init (EmpathyTpContactFactoryClass *klass);
-static void empathy_tp_contact_factory_init       (EmpathyTpContactFactory      *factory);
+       gchar         **avatar_mime_types;
+       guint           avatar_min_width;
+       guint           avatar_min_height;
+       guint           avatar_max_width;
+       guint           avatar_max_height;
+       guint           avatar_max_size;
+       /* can_request_ft and can_request_st are meaningful only if the connection
+        * doesn't implement ContactCapabilities. If it's implemented, we use it to
+        * check if contacts support file transfer and stream tubes. */
+       gboolean        can_request_ft;
+       gboolean        can_request_st;
+       /* TRUE if ContactCapabilities is implemented by the Connection */
+       gboolean        contact_caps_supported;
+} EmpathyTpContactFactoryPriv;
 
 G_DEFINE_TYPE (EmpathyTpContactFactory, empathy_tp_contact_factory, G_TYPE_OBJECT);
 
 enum {
        PROP_0,
-       PROP_ACCOUNT,
+       PROP_CONNECTION,
+
+       PROP_MIME_TYPES,
+       PROP_MIN_WIDTH,
+       PROP_MIN_HEIGHT,
+       PROP_MAX_WIDTH,
+       PROP_MAX_HEIGHT,
+       PROP_MAX_SIZE
+};
+
+static TpContactFeature contact_features[] = {
+       TP_CONTACT_FEATURE_ALIAS,
+       TP_CONTACT_FEATURE_PRESENCE,
 };
 
 static EmpathyContact *
@@ -73,14 +97,14 @@ tp_contact_factory_find_by_handle (EmpathyTpContactFactory *tp_factory,
 }
 
 static EmpathyContact *
-tp_contact_factory_find_by_id (EmpathyTpContactFactory *tp_factory,
-                              const gchar             *id)
+tp_contact_factory_find_by_tp_contact (EmpathyTpContactFactory *tp_factory,
+                                      TpContact               *tp_contact)
 {
        EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
        GList                       *l;
 
        for (l = priv->contacts; l; l = l->next) {
-               if (!tp_strdiff (empathy_contact_get_id (l->data), id)) {
+               if (empathy_contact_get_tp_contact (l->data) == tp_contact) {
                        return l->data;
                }
        }
@@ -94,107 +118,11 @@ tp_contact_factory_weak_notify (gpointer data,
 {
        EmpathyTpContactFactoryPriv *priv = GET_PRIV (data);
 
-       empathy_debug (DEBUG_DOMAIN, "Remove finalized contact %p",
-                      where_the_object_was);
+       DEBUG ("Remove finalized contact %p", where_the_object_was);
 
        priv->contacts = g_list_remove (priv->contacts, where_the_object_was);
 }
 
-static void
-tp_contact_factory_presences_table_foreach (const gchar    *state_str,
-                                           GHashTable     *presences_table,
-                                           EmpathyContact *contact)
-{
-       const GValue *message;
-
-       empathy_contact_set_presence (contact,
-                                     empathy_presence_from_str (state_str));
-       
-       message = g_hash_table_lookup (presences_table, "message");
-       if (message != NULL) {
-               empathy_contact_set_presence_message (contact,
-                                                     g_value_get_string (message));
-       } else {
-               empathy_contact_set_presence_message (contact, NULL);
-       }
-}
-
-static void
-tp_contact_factory_parse_presence_foreach (guint                    handle,
-                                          GValueArray             *presence_struct,
-                                          EmpathyTpContactFactory *tp_factory)
-{
-       GHashTable      *presences_table;
-       EmpathyContact  *contact;
-
-       contact = tp_contact_factory_find_by_handle (tp_factory, handle);
-       if (!contact) {
-               return;
-       }
-
-       presences_table = g_value_get_boxed (g_value_array_get_nth (presence_struct, 1));
-
-       g_hash_table_foreach (presences_table,
-                             (GHFunc) tp_contact_factory_presences_table_foreach,
-                             contact);
-
-       empathy_debug (DEBUG_DOMAIN, "Changing presence for contact %s (%d) to %s (%d)",
-                     empathy_contact_get_id (contact),
-                     handle,
-                     empathy_contact_get_presence_message (contact),
-                     empathy_contact_get_presence (contact));
-}
-
-static void
-tp_contact_factory_get_presence_cb (TpConnection *connection,
-                                   GHashTable   *handle_table,
-                                   const GError *error,
-                                   gpointer      user_data,
-                                   GObject      *tp_factory)
-{
-       if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Error getting presence: %s",
-                             error->message);
-               if (error->domain == TP_DBUS_ERRORS &&
-                   error->code == TP_DBUS_ERROR_NO_INTERFACE) {
-                       guint *handles = user_data;
-
-                       /* We have no presence iface, set default presence
-                        * to available */
-                       while (*handles != 0) {
-                               EmpathyContact *contact;
-
-                               contact = tp_contact_factory_find_by_handle (
-                                       (EmpathyTpContactFactory*) tp_factory,
-                                       *handles);
-                               if (contact) {
-                                       empathy_contact_set_presence (contact,
-                                                                     MC_PRESENCE_AVAILABLE);
-                               }
-
-                               handles++;
-                       }
-               }
-
-               return;
-       }
-
-       g_hash_table_foreach (handle_table,
-                             (GHFunc) tp_contact_factory_parse_presence_foreach,
-                             EMPATHY_TP_CONTACT_FACTORY (tp_factory));
-}
-
-static void
-tp_contact_factory_presence_update_cb (TpConnection *connection,
-                                      GHashTable   *handle_table,
-                                      gpointer      user_data,
-                                      GObject      *tp_factory)
-{
-       g_hash_table_foreach (handle_table,
-                             (GHFunc) tp_contact_factory_parse_presence_foreach,
-                             EMPATHY_TP_CONTACT_FACTORY (tp_factory));
-}
-
 static void
 tp_contact_factory_set_aliases_cb (TpConnection *connection,
                                   const GError *error,
@@ -202,78 +130,18 @@ tp_contact_factory_set_aliases_cb (TpConnection *connection,
                                   GObject      *tp_factory)
 {
        if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Error setting alias: %s",
-                              error->message);
-       }
-}
-
-static void
-tp_contact_factory_request_aliases_cb (TpConnection *connection,
-                                      const gchar  **contact_names,
-                                      const GError  *error,
-                                      gpointer       user_data,
-                                      GObject       *tp_factory)
-{
-       guint        *handles = user_data;
-       guint         i = 0;
-       const gchar **name;
-
-       if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Error requesting aliases: %s",
-                             error->message);
-               return;
-       }
-
-       for (name = contact_names; *name; name++) {
-               EmpathyContact *contact;
-
-               contact = tp_contact_factory_find_by_handle (EMPATHY_TP_CONTACT_FACTORY (tp_factory),
-                                                            handles[i]);
-               if (!contact) {
-                       continue;
-               }
-
-               empathy_debug (DEBUG_DOMAIN, "Renaming contact %s (%d) to %s (request cb)",
-                              empathy_contact_get_id (contact),
-                              empathy_contact_get_handle (contact),
-                              *name);
-
-               empathy_contact_set_name (contact, *name);
-
-               i++;
+               DEBUG ("Error: %s", error->message);
        }
 }
 
 static void
-tp_contact_factory_aliases_changed_cb (TpConnection    *connection,
-                                      const GPtrArray *renamed_handlers,
-                                      gpointer         user_data,
-                                      GObject         *weak_object)
+tp_contact_factory_set_location_cb (TpConnection *tp_conn,
+                                   const GError *error,
+                                   gpointer user_data,
+                                   GObject *weak_object)
 {
-       EmpathyTpContactFactory *tp_factory = EMPATHY_TP_CONTACT_FACTORY (weak_object);
-       guint                    i;
-
-       for (i = 0; renamed_handlers->len > i; i++) {
-               guint           handle;
-               const gchar    *alias;
-               GValueArray    *renamed_struct;
-               EmpathyContact *contact;
-
-               renamed_struct = g_ptr_array_index (renamed_handlers, i);
-               handle = g_value_get_uint (g_value_array_get_nth (renamed_struct, 0));
-               alias = g_value_get_string (g_value_array_get_nth (renamed_struct, 1));
-               contact = tp_contact_factory_find_by_handle (tp_factory, handle);
-
-               if (!contact) {
-                       /* We don't know this contact, skip */
-                       continue;
-               }
-
-               empathy_debug (DEBUG_DOMAIN, "Renaming contact %s (%d) to %s (changed cb)",
-                              empathy_contact_get_id (contact),
-                              handle, alias);
-
-               empathy_contact_set_name (contact, alias);
+       if (error != NULL) {
+               DEBUG ("Error setting location: %s", error->message);
        }
 }
 
@@ -285,8 +153,7 @@ tp_contact_factory_set_avatar_cb (TpConnection *connection,
                                  GObject      *tp_factory)
 {
        if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Error setting avatar: %s",
-                              error->message);
+               DEBUG ("Error: %s", error->message);
        }
 }
 
@@ -297,8 +164,7 @@ tp_contact_factory_clear_avatar_cb (TpConnection *connection,
                                    GObject      *tp_factory)
 {
        if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Error clearing avatar: %s",
-                              error->message);
+               DEBUG ("Error: %s", error->message);
        }
 }
 
@@ -312,7 +178,6 @@ tp_contact_factory_avatar_retrieved_cb (TpConnection *connection,
                                        GObject      *tp_factory)
 {
        EmpathyContact *contact;
-       EmpathyAvatar  *avatar;
 
        contact = tp_contact_factory_find_by_handle (EMPATHY_TP_CONTACT_FACTORY (tp_factory),
                                                     handle);
@@ -320,17 +185,15 @@ tp_contact_factory_avatar_retrieved_cb (TpConnection *connection,
                return;
        }
 
-       empathy_debug (DEBUG_DOMAIN, "Avatar retrieved for contact %s (%d)",
-                      empathy_contact_get_id (contact),
-                      handle);
-
-       avatar = empathy_avatar_new (avatar_data->data,
-                                    avatar_data->len,
-                                    mime_type,
-                                    token);
+       DEBUG ("Avatar retrieved for contact %s (%d)",
+               empathy_contact_get_id (contact),
+               handle);
 
-       empathy_contact_set_avatar (contact, avatar);
-       empathy_avatar_unref (avatar);
+       empathy_contact_load_avatar_data (contact,
+                                         (guchar *) avatar_data->data,
+                                         avatar_data->len,
+                                         mime_type,
+                                         token);
 }
 
 static void
@@ -340,8 +203,7 @@ tp_contact_factory_request_avatars_cb (TpConnection *connection,
                                       GObject      *tp_factory)
 {
        if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Error requesting avatars: %s",
-                              error->message);
+               DEBUG ("Error: %s", error->message);
        }
 }
 
@@ -359,7 +221,7 @@ tp_contact_factory_avatar_maybe_update (EmpathyTpContactFactory *tp_factory,
        }
 
        /* Check if we have an avatar */
-       if (G_STR_EMPTY (token)) {
+       if (EMP_STR_EMPTY (token)) {
                empathy_contact_set_avatar (contact, NULL);
                return TRUE;
        }
@@ -371,11 +233,8 @@ tp_contact_factory_avatar_maybe_update (EmpathyTpContactFactory *tp_factory,
        }
 
        /* The avatar changed, search the new one in the cache */
-       avatar = empathy_avatar_new_from_cache (token);
-       if (avatar) {
+       if (empathy_contact_load_avatar_cache (contact, token)) {
                /* Got from cache, use it */
-               empathy_contact_set_avatar (contact, avatar);
-               empathy_avatar_unref (avatar);
                return TRUE;
        }
 
@@ -383,63 +242,51 @@ tp_contact_factory_avatar_maybe_update (EmpathyTpContactFactory *tp_factory,
        return FALSE;
 }
 
-typedef struct {
-       EmpathyTpContactFactory *tp_factory;
-       GArray                  *handles;
-} TokensData;
-
-static void
-tp_contact_factory_avatar_tokens_foreach (gpointer key,
-                                         gpointer value,
-                                         gpointer user_data)
-{
-       TokensData  *data = user_data;
-       const gchar *token = value;
-       guint        handle = GPOINTER_TO_UINT (key);
-
-       if (!tp_contact_factory_avatar_maybe_update (data->tp_factory,
-                                                    handle, token)) {
-               g_array_append_val (data->handles, handle);
-       }
-}
-
 static void
-tp_contact_factory_get_known_avatar_tokens_cb (TpConnection *connection,
-                                              GHashTable   *tokens,
-                                              const GError *error,
-                                              gpointer      user_data,
-                                              GObject      *tp_factory)
+tp_contact_factory_got_known_avatar_tokens (TpConnection *connection,
+                                           GHashTable   *tokens,
+                                           const GError *error,
+                                           gpointer      user_data,
+                                           GObject      *weak_object)
 {
-       TokensData data;
+       EmpathyTpContactFactory *tp_factory = EMPATHY_TP_CONTACT_FACTORY (weak_object);
+       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
+       GArray *handles;
+       GHashTableIter iter;
+       gpointer key, value;
 
        if (error) {
-               empathy_debug (DEBUG_DOMAIN,
-                              "Error getting known avatars tokens: %s",
-                              error->message);
+               DEBUG ("Error: %s", error->message);
                return;
        }
 
-       data.tp_factory = EMPATHY_TP_CONTACT_FACTORY (tp_factory);
-       data.handles = g_array_new (FALSE, FALSE, sizeof (guint));
-       g_hash_table_foreach (tokens,
-                             tp_contact_factory_avatar_tokens_foreach,
-                             &data);
+       handles = g_array_new (FALSE, FALSE, sizeof (guint));
+
+       g_hash_table_iter_init (&iter, tokens);
+       while (g_hash_table_iter_next (&iter, &key, &value)) {
+               guint handle = GPOINTER_TO_UINT (key);
+               const gchar *token = value;
+
+               if (!tp_contact_factory_avatar_maybe_update (tp_factory,
+                                                            handle, token)) {
+                       g_array_append_val (handles, handle);
+               }
+       }
 
-       empathy_debug (DEBUG_DOMAIN, "Got %d tokens, need to request %d avatars",
-                      g_hash_table_size (tokens),
-                      data.handles->len);
+       DEBUG ("Got %d tokens, need to request %d avatars",
+               g_hash_table_size (tokens), handles->len);
 
        /* Request needed avatars */
-       if (data.handles->len > 0) {
-               tp_cli_connection_interface_avatars_call_request_avatars (connection,
+       if (handles->len > 0) {
+               tp_cli_connection_interface_avatars_call_request_avatars (priv->connection,
                                                                          -1,
-                                                                         data.handles,
+                                                                         handles,
                                                                          tp_contact_factory_request_avatars_cb,
                                                                          NULL, NULL,
-                                                                         tp_factory);
+                                                                         G_OBJECT (tp_factory));
        }
 
-       g_array_free (data.handles, TRUE);
+       g_array_free (handles, TRUE);
 }
 
 static void
@@ -457,8 +304,7 @@ tp_contact_factory_avatar_updated_cb (TpConnection *connection,
                return;
        }
 
-       empathy_debug (DEBUG_DOMAIN, "Need to request avatar for token %s",
-                      new_token);
+       DEBUG ("Need to request avatar for token %s", new_token);
 
        handles = g_array_new (FALSE, FALSE, sizeof (guint));
        g_array_append_val (handles, handle);
@@ -501,27 +347,28 @@ tp_contact_factory_update_capabilities (EmpathyTpContactFactory *tp_factory,
                }
        }
 
-       empathy_debug (DEBUG_DOMAIN, "Changing capabilities for contact %s (%d) to %d",
-                      empathy_contact_get_id (contact),
-                      empathy_contact_get_handle (contact),
-                      capabilities);
+       DEBUG ("Changing capabilities for contact %s (%d) to %d",
+               empathy_contact_get_id (contact),
+               empathy_contact_get_handle (contact),
+               capabilities);
 
        empathy_contact_set_capabilities (contact, capabilities);
 }
 
 static void
-tp_contact_factory_get_capabilities_cb (TpConnection    *connection,
-                                       const GPtrArray *capabilities,
-                                       const GError    *error,
-                                       gpointer         user_data,
-                                       GObject         *weak_object)
+tp_contact_factory_got_capabilities (TpConnection    *connection,
+                                    const GPtrArray *capabilities,
+                                    const GError    *error,
+                                    gpointer         user_data,
+                                    GObject         *weak_object)
 {
-       EmpathyTpContactFactory *tp_factory = EMPATHY_TP_CONTACT_FACTORY (weak_object);
-       guint                    i;
+       EmpathyTpContactFactory *tp_factory;
+       guint i;
+
+       tp_factory = EMPATHY_TP_CONTACT_FACTORY (weak_object);
 
        if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Error getting capabilities: %s",
-                              error->message);
+               DEBUG ("Error: %s", error->message);
                /* FIXME Should set the capabilities of the contacts for which this request
                 * originated to NONE */
                return;
@@ -548,6 +395,203 @@ tp_contact_factory_get_capabilities_cb (TpConnection    *connection,
        }
 }
 
+#if HAVE_GEOCLUE
+#define GEOCODE_SERVICE "org.freedesktop.Geoclue.Providers.Yahoo"
+#define GEOCODE_PATH "/org/freedesktop/Geoclue/Providers/Yahoo"
+
+/* This callback is called by geoclue when it found a position
+ * for the given address.  A position is necessary for a contact
+ * to show up on the map
+ */
+static void
+geocode_cb (GeoclueGeocode *geocode,
+           GeocluePositionFields fields,
+           double latitude,
+           double longitude,
+           double altitude,
+           GeoclueAccuracy *accuracy,
+           GError *error,
+           gpointer contact)
+{
+       GValue *new_value;
+       GHashTable *location;
+
+       location = empathy_contact_get_location (EMPATHY_CONTACT (contact));
+
+       if (error != NULL) {
+               DEBUG ("Error geocoding location : %s", error->message);
+               g_object_unref (geocode);
+               g_object_unref (contact);
+               return;
+       }
+
+       if (fields & GEOCLUE_POSITION_FIELDS_LATITUDE) {
+               new_value = tp_g_value_slice_new_double (latitude);
+               g_hash_table_replace (location, g_strdup (EMPATHY_LOCATION_LAT),
+                       new_value);
+               DEBUG ("\t - Latitude: %f", latitude);
+       }
+       if (fields & GEOCLUE_POSITION_FIELDS_LONGITUDE) {
+               new_value = tp_g_value_slice_new_double (longitude);
+               g_hash_table_replace (location, g_strdup (EMPATHY_LOCATION_LON),
+                       new_value);
+               DEBUG ("\t - Longitude: %f", longitude);
+       }
+       if (fields & GEOCLUE_POSITION_FIELDS_ALTITUDE) {
+               new_value = tp_g_value_slice_new_double (altitude);
+               g_hash_table_replace (location, g_strdup (EMPATHY_LOCATION_ALT),
+                       new_value);
+               DEBUG ("\t - Altitude: %f", altitude);
+       }
+
+       /* Don't change the accuracy as we used an address to get this position */
+       g_object_notify (contact, "location");
+       g_object_unref (geocode);
+       g_object_unref (contact);
+}
+#endif
+
+#if HAVE_GEOCLUE
+static gchar *
+get_dup_string (GHashTable *location,
+    gchar *key)
+{
+  GValue *value;
+
+  value = g_hash_table_lookup (location, key);
+  if (value != NULL)
+    return g_value_dup_string (value);
+
+  return NULL;
+}
+#endif
+
+static void
+tp_contact_factory_geocode (EmpathyContact *contact)
+{
+#if HAVE_GEOCLUE
+       static GeoclueGeocode *geocode;
+       gchar *str;
+       GHashTable *address;
+       GValue* value;
+       GHashTable *location;
+
+       location = empathy_contact_get_location (contact);
+       if (location == NULL)
+               return;
+
+       value = g_hash_table_lookup (location, EMPATHY_LOCATION_LAT);
+       if (value != NULL)
+               return;
+
+       if (geocode == NULL) {
+               geocode = geoclue_geocode_new (GEOCODE_SERVICE, GEOCODE_PATH);
+               g_object_add_weak_pointer (G_OBJECT (geocode), (gpointer *) &geocode);
+       }
+       else
+               g_object_ref (geocode);
+
+       address = geoclue_address_details_new ();
+
+       str = get_dup_string (location, EMPATHY_LOCATION_COUNTRY_CODE);
+       if (str != NULL) {
+               g_hash_table_insert (address,
+                       g_strdup (GEOCLUE_ADDRESS_KEY_COUNTRYCODE), str);
+               DEBUG ("\t - countrycode: %s", str);
+       }
+
+       str = get_dup_string (location, EMPATHY_LOCATION_COUNTRY);
+       if (str != NULL) {
+               g_hash_table_insert (address,
+                       g_strdup (GEOCLUE_ADDRESS_KEY_COUNTRY), str);
+               DEBUG ("\t - country: %s", str);
+       }
+
+       str = get_dup_string (location, EMPATHY_LOCATION_POSTAL_CODE);
+       if (str != NULL) {
+               g_hash_table_insert (address,
+                       g_strdup (GEOCLUE_ADDRESS_KEY_POSTALCODE), str);
+               DEBUG ("\t - postalcode: %s", str);
+       }
+
+       str = get_dup_string (location, EMPATHY_LOCATION_REGION);
+       if (str != NULL) {
+               g_hash_table_insert (address,
+                       g_strdup (GEOCLUE_ADDRESS_KEY_REGION), str);
+               DEBUG ("\t - region: %s", str);
+       }
+
+       str = get_dup_string (location, EMPATHY_LOCATION_LOCALITY);
+       if (str != NULL) {
+               g_hash_table_insert (address,
+                       g_strdup (GEOCLUE_ADDRESS_KEY_LOCALITY), str);
+               DEBUG ("\t - locality: %s", str);
+       }
+
+       str = get_dup_string (location, EMPATHY_LOCATION_STREET);
+       if (str != NULL) {
+               g_hash_table_insert (address,
+                       g_strdup (GEOCLUE_ADDRESS_KEY_STREET), str);
+               DEBUG ("\t - street: %s", str);
+       }
+
+       g_object_ref (contact);
+       geoclue_geocode_address_to_position_async (geocode, address,
+               geocode_cb, contact);
+
+       g_hash_table_unref (address);
+#endif
+}
+
+static void
+tp_contact_factory_update_location (EmpathyTpContactFactory *tp_factory,
+                                   guint handle,
+                                   GHashTable *location)
+{
+       EmpathyContact *contact;
+       GHashTable     *new_location;
+
+       contact = tp_contact_factory_find_by_handle (tp_factory, handle);
+
+       if (contact == NULL)
+               return;
+
+       new_location = g_hash_table_new_full (g_str_hash, g_str_equal,
+               (GDestroyNotify) g_free, (GDestroyNotify) tp_g_value_slice_free);
+       tp_g_hash_table_update (new_location, location, (GBoxedCopyFunc) g_strdup,
+               (GBoxedCopyFunc) tp_g_value_slice_dup);
+       empathy_contact_set_location (contact, new_location);
+       g_hash_table_unref (new_location);
+
+       tp_contact_factory_geocode (contact);
+}
+
+static void
+tp_contact_factory_got_locations (TpConnection                 *tp_conn,
+                                 GHashTable              *locations,
+                                 const GError            *error,
+                                 gpointer                 user_data,
+                                 GObject                 *weak_object)
+{
+       GHashTableIter iter;
+       gpointer key, value;
+       EmpathyTpContactFactory *tp_factory;
+
+       tp_factory = EMPATHY_TP_CONTACT_FACTORY (user_data);
+       if (error != NULL) {
+               DEBUG ("Error: %s", error->message);
+               return;
+       }
+
+       g_hash_table_iter_init (&iter, locations);
+       while (g_hash_table_iter_next (&iter, &key, &value)) {
+               guint           handle = GPOINTER_TO_INT (key);
+               GHashTable     *location = value;
+
+               tp_contact_factory_update_location (tp_factory, handle, location);
+       }
+}
+
 static void
 tp_contact_factory_capabilities_changed_cb (TpConnection    *connection,
                                            const GPtrArray *capabilities,
@@ -579,482 +623,621 @@ tp_contact_factory_capabilities_changed_cb (TpConnection    *connection,
 }
 
 static void
-tp_contact_factory_request_everything (EmpathyTpContactFactory *tp_factory,
-                                      const GArray            *handles)
+tp_contact_factory_location_updated_cb (TpConnection      *tp_conn,
+                                       guint         handle,
+                                       GHashTable   *location,
+                                       gpointer      user_data,
+                                       GObject      *weak_object)
 {
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-       guint                       *dup_handles;
+       EmpathyTpContactFactory *tp_factory = EMPATHY_TP_CONTACT_FACTORY (weak_object);
+       tp_contact_factory_update_location (tp_factory, handle, location);
+}
 
-       if (!priv->ready) {
-               return;
-       }
+static EmpathyCapabilities
+channel_classes_to_capabilities (GPtrArray *classes,
+                                gboolean audio_video)
+{
+       EmpathyCapabilities capabilities = 0;
+       guint i;
+
+       for (i = 0; i < classes->len; i++) {
+               GValueArray *class_struct;
+               GHashTable *fixed_prop;
+               GStrv allowed_prop;
+               TpHandleType handle_type;
+               const gchar *chan_type;
+
+               class_struct = g_ptr_array_index (classes, i);
+               fixed_prop = g_value_get_boxed (g_value_array_get_nth (class_struct, 0));
+               allowed_prop = g_value_get_boxed (g_value_array_get_nth (class_struct, 1));
+
+               handle_type = tp_asv_get_uint32 (fixed_prop,
+                       TP_IFACE_CHANNEL ".TargetHandleType", NULL);
+               if (handle_type != TP_HANDLE_TYPE_CONTACT)
+                       continue;
 
-       dup_handles = g_malloc0 ((handles->len + 1) * sizeof (guint));
-       g_memmove (dup_handles, handles->data, handles->len * sizeof (guint));
-       tp_cli_connection_interface_presence_call_get_presence (priv->connection,
-                                                               -1,
-                                                               handles,
-                                                               tp_contact_factory_get_presence_cb,
-                                                               dup_handles, g_free,
-                                                               G_OBJECT (tp_factory));
-
-       dup_handles = g_memdup (handles->data, handles->len * sizeof (guint));
-       tp_cli_connection_interface_aliasing_call_request_aliases (priv->connection,
-                                                                  -1,
-                                                                  handles,
-                                                                  tp_contact_factory_request_aliases_cb,
-                                                                  dup_handles, g_free,
-                                                                  G_OBJECT (tp_factory));
-
-       tp_cli_connection_interface_avatars_call_get_known_avatar_tokens (priv->connection,
-                                                                         -1,
-                                                                         handles,
-                                                                         tp_contact_factory_get_known_avatar_tokens_cb,
-                                                                         NULL, NULL,
-                                                                         G_OBJECT (tp_factory));
+               chan_type = tp_asv_get_string (fixed_prop,
+                       TP_IFACE_CHANNEL ".ChannelType");
 
-       tp_cli_connection_interface_capabilities_call_get_capabilities (priv->connection,
-                                                                       -1,
-                                                                       handles,
-                                                                       tp_contact_factory_get_capabilities_cb,
-                                                                       NULL, NULL,
-                                                                       G_OBJECT (tp_factory));
-}
+               if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) {
+                       capabilities |= EMPATHY_CAPABILITIES_FT;
+               }
 
-static void
-tp_contact_factory_list_free (gpointer data)
-{
-       GList *l = data;
+               else if (!tp_strdiff (chan_type, TP_IFACE_CHANNEL_TYPE_STREAM_TUBE)) {
+                       capabilities |= EMPATHY_CAPABILITIES_STREAM_TUBE;
+               }
+               else if (audio_video && !tp_strdiff (chan_type,
+                       TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) {
+                       guint j;
+
+                       for (j = 0; allowed_prop[j] != NULL; j++) {
+                               if (!tp_strdiff (allowed_prop[j],
+                                               TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialAudio"))
+                                       capabilities |= EMPATHY_CAPABILITIES_AUDIO;
+                               else if (!tp_strdiff (allowed_prop[j],
+                                               TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA ".InitialVideo"))
+                                       capabilities |= EMPATHY_CAPABILITIES_VIDEO;
+                       }
+               }
+       }
 
-       g_list_foreach (l, (GFunc) g_object_unref, NULL);
-       g_list_free (l);
+       return capabilities;
 }
 
 static void
-tp_contact_factory_request_handles_cb (TpConnection *connection,
-                                      const GArray *handles,
-                                      const GError *error,
-                                      gpointer      user_data,
-                                      GObject      *tp_factory)
+get_requestable_channel_classes_cb (TpProxy *connection,
+                                   const GValue *value,
+                                   const GError *error,
+                                   gpointer user_data,
+                                   GObject *weak_object)
 {
-       GList *contacts = user_data;
-       GList *l;
-       guint  i = 0;
+       EmpathyTpContactFactory     *self = EMPATHY_TP_CONTACT_FACTORY (weak_object);
+       EmpathyTpContactFactoryPriv *priv = GET_PRIV (self);
+       GPtrArray                   *classes;
+       GList                       *l;
+       EmpathyCapabilities         capabilities;
 
-       if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Failed to request handles: %s",
-                              error->message);
+       if (error != NULL) {
+               DEBUG ("Error: %s", error->message);
                return;
        }
 
-       for (l = contacts; l; l = l->next) {
-               guint handle;
+       classes = g_value_get_boxed (value);
 
-               handle = g_array_index (handles, guint, i);
-               empathy_contact_set_handle (l->data, handle);
+       DEBUG ("ContactCapabilities is not implemented; use RCC");
+       capabilities = channel_classes_to_capabilities (classes, FALSE);
+       if ((capabilities & EMPATHY_CAPABILITIES_FT) != 0) {
+               DEBUG ("Assume all contacts support FT as CM implements it");
+               priv->can_request_ft = TRUE;
+       }
 
-               i++;
+       if ((capabilities & EMPATHY_CAPABILITIES_STREAM_TUBE) != 0) {
+               DEBUG ("Assume all contacts support stream tubes as CM implements them");
+               priv->can_request_st = TRUE;
        }
 
-       tp_contact_factory_request_everything (EMPATHY_TP_CONTACT_FACTORY (tp_factory),
-                                              handles);
+       if (!priv->can_request_ft && !priv->can_request_st)
+               return ;
+
+       /* Update the capabilities of all contacts */
+       for (l = priv->contacts; l != NULL; l = g_list_next (l)) {
+               EmpathyContact *contact = l->data;
+               EmpathyCapabilities caps;
+
+               caps = empathy_contact_get_capabilities (contact);
+
+               /* ContactCapabilities is not supported; assume all contacts can do file
+                * transfer if it's implemented in the CM */
+               if (priv->can_request_ft)
+                       caps |= EMPATHY_CAPABILITIES_FT;
+
+               if (priv->can_request_st)
+                       caps |= EMPATHY_CAPABILITIES_STREAM_TUBE;
+
+               empathy_contact_set_capabilities (contact, caps);
+       }
 }
 
 static void
-tp_contact_factory_inspect_handles_cb (TpConnection  *connection,
-                                      const gchar  **ids,
-                                      const GError  *error,
-                                      gpointer       user_data,
-                                      GObject       *tp_factory)
+tp_contact_factory_got_avatar_requirements_cb (TpConnection *proxy,
+                                              const gchar **mime_types,
+                                              guint         min_width,
+                                              guint         min_height,
+                                              guint         max_width,
+                                              guint         max_height,
+                                              guint         max_size,
+                                              const GError *error,
+                                              gpointer      user_data,
+                                              GObject      *tp_factory)
 {
-       const gchar **id;
-       GList        *contacts = user_data;
-       GList        *l;
+       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
 
        if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Failed to inspect handles: %s",
-                              error->message);
-               return;
-       }
-
-       id = ids;
-       for (l = contacts; l; l = l->next) {
-               empathy_contact_set_id (l->data, *id);
-               id++;
+               DEBUG ("Failed to get avatar requirements: %s", error->message);
+               /* We'll just leave avatar_mime_types as NULL; the
+                * avatar-setting code can use this as a signal that you can't
+                * set avatars.
+                */
+       } else {
+               priv->avatar_mime_types = g_strdupv ((gchar **) mime_types);
+               priv->avatar_min_width = min_width;
+               priv->avatar_min_height = min_height;
+               priv->avatar_max_width = max_width;
+               priv->avatar_max_height = max_height;
+               priv->avatar_max_size = max_size;
        }
 }
 
 static void
-tp_contact_factory_disconnect_contact_foreach (gpointer data,
-                                              gpointer user_data)
+update_contact_capabilities (EmpathyTpContactFactory *self,
+                            GHashTable *caps)
 {
-       EmpathyContact *contact = data;
-       
-       empathy_contact_set_presence (contact, MC_PRESENCE_UNSET);
-       empathy_contact_set_handle (contact, 0);
+       GHashTableIter iter;
+       gpointer key, value;
+
+       g_hash_table_iter_init (&iter, caps);
+       while (g_hash_table_iter_next (&iter, &key, &value)) {
+               TpHandle handle = GPOINTER_TO_UINT (key);
+               GPtrArray *classes = value;
+               EmpathyContact *contact;
+               EmpathyCapabilities  capabilities;
+
+               contact = tp_contact_factory_find_by_handle (self, handle);
+               if (contact == NULL)
+                       continue;
+
+               capabilities = empathy_contact_get_capabilities (contact);
+               capabilities &= ~EMPATHY_CAPABILITIES_UNKNOWN;
+
+               capabilities |= channel_classes_to_capabilities (classes, TRUE);
+
+               DEBUG ("Changing capabilities for contact %s (%d) to %d",
+                       empathy_contact_get_id (contact),
+                       empathy_contact_get_handle (contact),
+                       capabilities);
+
+               empathy_contact_set_capabilities (contact, capabilities);
+       }
 }
 
 static void
-tp_contact_factory_connection_invalidated_cb (EmpathyTpContactFactory *tp_factory)
+tp_contact_factory_got_contact_capabilities (TpConnection *connection,
+                                            GHashTable *caps,
+                                            const GError *error,
+                                            gpointer user_data,
+                                            GObject *weak_object)
 {
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
+       EmpathyTpContactFactory *self = EMPATHY_TP_CONTACT_FACTORY (weak_object);
 
-       empathy_debug (DEBUG_DOMAIN, "Connection invalidated");
-
-       g_object_unref (priv->connection);
-       priv->connection = NULL;
-       priv->ready = FALSE;
+       if (error != NULL) {
+               DEBUG ("Error: %s", error->message);
+               return;
+       }
 
-       g_list_foreach (priv->contacts,
-                       tp_contact_factory_disconnect_contact_foreach,
-                       tp_factory);
+       update_contact_capabilities (self, caps);
 }
 
-
 static void
-tp_contact_factory_got_self_handle_cb (TpConnection *proxy,
-                                      guint         handle,
-                                      const GError *error,
-                                      gpointer      user_data,
-                                      GObject      *tp_factory)
+tp_contact_factory_add_contact (EmpathyTpContactFactory *tp_factory,
+                               EmpathyContact          *contact)
 {
        EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-       GList                       *l;
-       GArray                      *handle_needed;
-       GArray                      *id_needed;
-       GList                       *handle_needed_contacts = NULL;
-       GList                       *id_needed_contacts = NULL;
+       TpHandle self_handle;
+       TpHandle handle;
+       GArray handles = {(gchar *) &handle, 1};
+       EmpathyCapabilities caps;
 
-       if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Failed to get self handles: %s",
-                              error->message);
-               return;
-       }
+       /* Keep a weak ref to that contact */
+       g_object_weak_ref (G_OBJECT (contact),
+                          tp_contact_factory_weak_notify,
+                          tp_factory);
+       priv->contacts = g_list_prepend (priv->contacts, contact);
 
-       empathy_debug (DEBUG_DOMAIN, "Connection ready");
+       /* The contact keeps a ref to its factory */
+       g_object_set_data_full (G_OBJECT (contact), "empathy-factory",
+                               g_object_ref (tp_factory),
+                               g_object_unref);
 
-       empathy_contact_set_handle (priv->user, handle);
-       priv->ready = TRUE;
+       caps = empathy_contact_get_capabilities (contact);
 
-       /* Connect signals */
-       tp_cli_connection_interface_aliasing_connect_to_aliases_changed (priv->connection,
-                                                                        tp_contact_factory_aliases_changed_cb,
-                                                                        NULL, NULL,
-                                                                        G_OBJECT (tp_factory),
-                                                                        NULL);
-       tp_cli_connection_interface_avatars_connect_to_avatar_updated (priv->connection,
-                                                                      tp_contact_factory_avatar_updated_cb,
-                                                                      NULL, NULL,
-                                                                      G_OBJECT (tp_factory),
-                                                                      NULL);
-       tp_cli_connection_interface_avatars_connect_to_avatar_retrieved (priv->connection,
-                                                                        tp_contact_factory_avatar_retrieved_cb,
-                                                                        NULL, NULL,
-                                                                        G_OBJECT (tp_factory),
-                                                                        NULL);
-       tp_cli_connection_interface_presence_connect_to_presence_update (priv->connection,
-                                                                        tp_contact_factory_presence_update_cb,
-                                                                        NULL, NULL,
-                                                                        G_OBJECT (tp_factory),
-                                                                        NULL);
-       tp_cli_connection_interface_capabilities_connect_to_capabilities_changed (priv->connection,
-                                                                                 tp_contact_factory_capabilities_changed_cb,
-                                                                                 NULL, NULL,
-                                                                                 G_OBJECT (tp_factory),
-                                                                                 NULL);
-
-       /* Request needed info for all existing contacts */
-       handle_needed = g_array_new (TRUE, FALSE, sizeof (gchar*));
-       id_needed = g_array_new (FALSE, FALSE, sizeof (guint));
-       for (l = priv->contacts; l; l = l->next) {
-               EmpathyContact *contact;
-               guint           handle;
-               const gchar    *id;
-
-               contact = l->data;
-               handle = empathy_contact_get_handle (contact);
-               id = empathy_contact_get_id (contact);
-               if (handle == 0) {
-                       g_assert (!G_STR_EMPTY (id));
-                       g_array_append_val (handle_needed, id);
-                       handle_needed_contacts = g_list_prepend (handle_needed_contacts,
-                                                                g_object_ref (contact));
+       /* Set the FT capability */
+       if (!priv->contact_caps_supported) {
+               /* ContactCapabilities is not supported; assume all contacts can do file
+                * transfer if it's implemented in the CM */
+               if (priv->can_request_ft) {
+                       caps |= EMPATHY_CAPABILITIES_FT;
                }
-               if (G_STR_EMPTY (id)) {
-                       g_array_append_val (id_needed, handle);
-                       id_needed_contacts = g_list_prepend (id_needed_contacts,
-                                                            g_object_ref (contact));
+
+               /* Set the Stream Tube capability */
+               if (priv->can_request_st) {
+                       caps |= EMPATHY_CAPABILITIES_STREAM_TUBE;
                }
        }
-       handle_needed_contacts = g_list_reverse (handle_needed_contacts);
-       id_needed_contacts = g_list_reverse (id_needed_contacts);
-
-       tp_cli_connection_call_request_handles (priv->connection,
-                                               -1,
-                                               TP_HANDLE_TYPE_CONTACT,
-                                               (const gchar**) handle_needed->data,
-                                               tp_contact_factory_request_handles_cb,
-                                               handle_needed_contacts, tp_contact_factory_list_free,
-                                               G_OBJECT (tp_factory));
-
-       tp_contact_factory_request_everything ((EmpathyTpContactFactory*) tp_factory,
-                                              id_needed);
-       tp_cli_connection_call_inspect_handles (priv->connection,
-                                               -1,
-                                               TP_HANDLE_TYPE_CONTACT,
-                                               id_needed,
-                                               tp_contact_factory_inspect_handles_cb,
-                                               id_needed_contacts, tp_contact_factory_list_free,
-                                               G_OBJECT (tp_factory));
-
-       g_array_free (handle_needed, TRUE);
-       g_array_free (id_needed, TRUE);
-}
 
-static void
-tp_contact_factory_connection_ready_cb (EmpathyTpContactFactory *tp_factory)
-{
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
+       empathy_contact_set_capabilities (contact, caps);
+
+       /* Set is-user property. Note that it could still be the handle is
+        * different from the connection's self handle, in the case the handle
+        * comes from a group interface. */
+       self_handle = tp_connection_get_self_handle (priv->connection);
+       handle = empathy_contact_get_handle (contact);
+       empathy_contact_set_is_user (contact, self_handle == handle);
+
+       /* FIXME: This should be done by TpContact */
+       if (tp_proxy_has_interface_by_id (priv->connection,
+                       TP_IFACE_QUARK_CONNECTION_INTERFACE_AVATARS)) {
+               tp_cli_connection_interface_avatars_call_get_known_avatar_tokens (
+                       priv->connection, -1, &handles,
+                       tp_contact_factory_got_known_avatar_tokens, NULL, NULL,
+                       G_OBJECT (tp_factory));
+       }
+
+       if (priv->contact_caps_supported) {
+               tp_cli_connection_interface_contact_capabilities_call_get_contact_capabilities (
+                       priv->connection, -1, &handles,
+                       tp_contact_factory_got_contact_capabilities, NULL, NULL,
+                       G_OBJECT (tp_factory));
+       }
+       else if (tp_proxy_has_interface_by_id (priv->connection,
+                       TP_IFACE_QUARK_CONNECTION_INTERFACE_CAPABILITIES)) {
+               tp_cli_connection_interface_capabilities_call_get_capabilities (
+                       priv->connection, -1, &handles,
+                       tp_contact_factory_got_capabilities, NULL, NULL,
+                       G_OBJECT (tp_factory));
+       }
+
+       if (tp_proxy_has_interface_by_id (TP_PROXY (priv->connection),
+               TP_IFACE_QUARK_CONNECTION_INTERFACE_LOCATION)) {
+               tp_cli_connection_interface_location_call_get_locations (priv->connection,
+                                                                        -1,
+                                                                        &handles,
+                                                                        tp_contact_factory_got_locations,
+                                                                        tp_factory,
+                                                                        NULL,
+                                                                        NULL);
+       }
 
-       /* Get our own handle */
-       tp_cli_connection_call_get_self_handle (priv->connection,
-                                               -1,
-                                               tp_contact_factory_got_self_handle_cb,
-                                               NULL, NULL,
-                                               G_OBJECT (tp_factory));
+       DEBUG ("Contact added: %s (%d)",
+               empathy_contact_get_id (contact),
+               empathy_contact_get_handle (contact));
 }
 
+typedef union {
+       EmpathyTpContactFactoryContactsByIdCb ids_cb;
+       EmpathyTpContactFactoryContactsByHandleCb handles_cb;
+       EmpathyTpContactFactoryContactCb contact_cb;
+} GetContactsCb;
+
+typedef struct {
+       EmpathyTpContactFactory *tp_factory;
+       GetContactsCb callback;
+       gpointer user_data;
+       GDestroyNotify destroy;
+} GetContactsData;
+
 static void
-tp_contact_factory_status_updated (EmpathyTpContactFactory *tp_factory)
+get_contacts_data_free (gpointer user_data)
 {
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-       TpConn                      *tp_conn;
-       gboolean                     connection_ready;
+       GetContactsData *data = user_data;
 
-       if (priv->connection) {
-               /* We already have our connection object */
-               return;
+       if (data->destroy) {
+               data->destroy (data->user_data);
        }
+       g_object_unref (data->tp_factory);
 
-       tp_conn = mission_control_get_connection (priv->mc, priv->account, NULL);
-       if (!tp_conn) {
-               return;
-       }
+       g_slice_free (GetContactsData, data);
+}
 
-       /* We got a new connection, wait for it to be ready */
-       priv->connection = tp_conn_dup_connection (tp_conn);
-       g_object_unref (tp_conn);
+static EmpathyContact *
+dup_contact_for_tp_contact (EmpathyTpContactFactory *tp_factory,
+                           TpContact               *tp_contact)
+{
+       EmpathyContact *contact;
 
-       g_signal_connect_swapped (priv->connection, "invalidated",
-                                 G_CALLBACK (tp_contact_factory_connection_invalidated_cb),
-                                 tp_factory);
+       contact = tp_contact_factory_find_by_tp_contact (tp_factory,
+                                                        tp_contact);
 
-       g_object_get (priv->connection, "connection-ready", &connection_ready, NULL);
-       if (connection_ready) {
-               tp_contact_factory_connection_ready_cb (tp_factory);
+       if (contact != NULL) {
+               g_object_ref (contact);
        } else {
-               g_signal_connect_swapped (priv->connection, "notify::connection-ready",
-                                         G_CALLBACK (tp_contact_factory_connection_ready_cb),
-                                         tp_factory);
+               contact = empathy_contact_new (tp_contact);
+               tp_contact_factory_add_contact (tp_factory, contact);
        }
+
+       return contact;
 }
 
-static void
-tp_contact_factory_status_changed_cb (MissionControl           *mc,
-                                     TpConnectionStatus        status,
-                                     McPresence                presence,
-                                     TpConnectionStatusReason  reason,
-                                     const gchar              *unique_name,
-                                     EmpathyTpContactFactory  *tp_factory)
+static EmpathyContact **
+contacts_array_new (EmpathyTpContactFactory *tp_factory,
+                   guint                    n_contacts,
+                   TpContact * const *      contacts)
 {
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-       McAccount                   *account;
+       EmpathyContact **ret;
+       guint            i;
 
-       account = mc_account_lookup (unique_name);
-       if (account && empathy_account_equal (account, priv->account)) {
-               tp_contact_factory_status_updated (tp_factory);
+       ret = g_new0 (EmpathyContact *, n_contacts);
+       for (i = 0; i < n_contacts; i++) {
+               ret[i] = dup_contact_for_tp_contact (tp_factory, contacts[i]);
        }
-       g_object_unref (account);
+
+       return ret;
 }
 
 static void
-tp_contact_factory_add_contact (EmpathyTpContactFactory *tp_factory,
-                               EmpathyContact          *contact)
+contacts_array_free (guint            n_contacts,
+                    EmpathyContact **contacts)
 {
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-
-       g_object_weak_ref (G_OBJECT (contact),
-                          tp_contact_factory_weak_notify,
-                          tp_factory);
-       priv->contacts = g_list_prepend (priv->contacts, contact);
+       guint i;
 
-       empathy_debug (DEBUG_DOMAIN, "Contact added: %s (%d)",
-                      empathy_contact_get_id (contact),
-                      empathy_contact_get_handle (contact));
+       for (i = 0; i < n_contacts; i++) {
+               g_object_unref (contacts[i]);
+       }
+       g_free (contacts);
 }
 
 static void
-tp_contact_factory_hold_handles_cb (TpConnection *connection,
-                                   const GError *error,
-                                   gpointer      userdata,
-                                   GObject      *tp_factory)
+get_contacts_by_id_cb (TpConnection *connection,
+                      guint n_contacts,
+                      TpContact * const *contacts,
+                      const gchar * const *requested_ids,
+                      GHashTable *failed_id_errors,
+                      const GError *error,
+                      gpointer user_data,
+                      GObject *weak_object)
 {
-       if (error) {
-               empathy_debug (DEBUG_DOMAIN, "Failed to hold handles: %s",
-                              error->message);
+       GetContactsData *data = user_data;
+       EmpathyContact **empathy_contacts;
+
+       empathy_contacts = contacts_array_new (data->tp_factory,
+                                              n_contacts, contacts);
+       if (data->callback.ids_cb) {
+               data->callback.ids_cb (data->tp_factory,
+                                      n_contacts, empathy_contacts,
+                                      requested_ids,
+                                      failed_id_errors,
+                                      error,
+                                      data->user_data, weak_object);
        }
+
+       contacts_array_free (n_contacts, empathy_contacts);
 }
 
-EmpathyContact *
-empathy_tp_contact_factory_get_user (EmpathyTpContactFactory *tp_factory)
+/* The callback is NOT given a reference to the EmpathyContact objects */
+void
+empathy_tp_contact_factory_get_from_ids (EmpathyTpContactFactory *tp_factory,
+                                        guint                    n_ids,
+                                        const gchar * const     *ids,
+                                        EmpathyTpContactFactoryContactsByIdCb callback,
+                                        gpointer                 user_data,
+                                        GDestroyNotify           destroy,
+                                        GObject                 *weak_object)
 {
        EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
+       GetContactsData *data;
 
-       g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory), NULL);
-
-       return g_object_ref (priv->user);
+       g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
+       g_return_if_fail (ids != NULL);
+
+       data = g_slice_new (GetContactsData);
+       data->callback.ids_cb = callback;
+       data->user_data = user_data;
+       data->destroy = destroy;
+       data->tp_factory = g_object_ref (tp_factory);
+       tp_connection_get_contacts_by_id (priv->connection,
+                                         n_ids, ids,
+                                         G_N_ELEMENTS (contact_features),
+                                         contact_features,
+                                         get_contacts_by_id_cb,
+                                         data,
+                                         (GDestroyNotify) get_contacts_data_free,
+                                         weak_object);
 }
 
-EmpathyContact *
-empathy_tp_contact_factory_get_from_id (EmpathyTpContactFactory *tp_factory,
-                                       const gchar             *id)
+static void
+get_contact_by_id_cb (TpConnection *connection,
+                     guint n_contacts,
+                     TpContact * const *contacts,
+                     const gchar * const *requested_ids,
+                     GHashTable *failed_id_errors,
+                     const GError *error,
+                     gpointer user_data,
+                     GObject *weak_object)
 {
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-       EmpathyContact              *contact;
-
-       g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory), NULL);
-       g_return_val_if_fail (id != NULL, NULL);
-
-       /* Check if the contact already exists */
-       contact = tp_contact_factory_find_by_id (tp_factory, id);
-       if (contact) {
-               return g_object_ref (contact);
-       }
-
-       /* Create new contact */
-       contact = g_object_new (EMPATHY_TYPE_CONTACT,
-                               "account", priv->account,
-                               "id", id,
-                               NULL);
-       tp_contact_factory_add_contact (tp_factory, contact);
-
-       if (priv->ready) {
-               const gchar *contact_ids[] = {id, NULL};
-               GList       *contacts;
-               
-               contacts = g_list_prepend (NULL, g_object_ref (contact));
-               tp_cli_connection_call_request_handles (priv->connection,
-                                                       -1,
-                                                       TP_HANDLE_TYPE_CONTACT,
-                                                       contact_ids,
-                                                       tp_contact_factory_request_handles_cb,
-                                                       contacts, tp_contact_factory_list_free,
-                                                       G_OBJECT (tp_factory));
+       GetContactsData *data = user_data;
+       EmpathyContact  *contact = NULL;
+
+       if (n_contacts == 1) {
+               contact = dup_contact_for_tp_contact (data->tp_factory,
+                                                     contacts[0]);
+       }
+       else if (error == NULL) {
+               GHashTableIter iter;
+               gpointer       value;
+
+               g_hash_table_iter_init (&iter, failed_id_errors);
+               while (g_hash_table_iter_next (&iter, NULL, &value)) {
+                       if (value) {
+                               error = value;
+                               break;
+                       }
+               }
        }
 
-       return contact;
+       if (data->callback.contact_cb) {
+               data->callback.contact_cb (data->tp_factory,
+                                          contact,
+                                          error,
+                                          data->user_data, weak_object);
+       }
+
+       if (contact != NULL)
+               g_object_unref (contact);
 }
 
-EmpathyContact *
-empathy_tp_contact_factory_get_from_handle (EmpathyTpContactFactory *tp_factory,
-                                           guint                    handle)
+/* The callback is NOT given a reference to the EmpathyContact objects */
+void
+empathy_tp_contact_factory_get_from_id (EmpathyTpContactFactory *tp_factory,
+                                       const gchar             *id,
+                                       EmpathyTpContactFactoryContactCb callback,
+                                       gpointer                 user_data,
+                                       GDestroyNotify           destroy,
+                                       GObject                 *weak_object)
 {
-       EmpathyContact *contact;
-       GArray         *handles;
-       GList          *contacts;
-
-       g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory), NULL);
-
-       handles = g_array_new (FALSE, FALSE, sizeof (guint));
-       g_array_append_val (handles, handle);
+       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
+       GetContactsData *data;
 
-       contacts = empathy_tp_contact_factory_get_from_handles (tp_factory, handles);
-       g_array_free (handles, TRUE);
+       g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
+       g_return_if_fail (id != NULL);
+
+       data = g_slice_new (GetContactsData);
+       data->callback.contact_cb = callback;
+       data->user_data = user_data;
+       data->destroy = destroy;
+       data->tp_factory = g_object_ref (tp_factory);
+       tp_connection_get_contacts_by_id (priv->connection,
+                                         1, &id,
+                                         G_N_ELEMENTS (contact_features),
+                                         contact_features,
+                                         get_contact_by_id_cb,
+                                         data,
+                                         (GDestroyNotify) get_contacts_data_free,
+                                         weak_object);
+}
 
-       contact = contacts ? contacts->data : NULL;
-       g_list_free (contacts);
+static void
+get_contacts_by_handle_cb (TpConnection *connection,
+                          guint n_contacts,
+                          TpContact * const *contacts,
+                          guint n_failed,
+                          const TpHandle *failed,
+                          const GError *error,
+                          gpointer user_data,
+                          GObject *weak_object)
+{
+       GetContactsData *data = user_data;
+       EmpathyContact **empathy_contacts;
+
+       empathy_contacts = contacts_array_new (data->tp_factory,
+                                              n_contacts, contacts);
+       if (data->callback.handles_cb) {
+               data->callback.handles_cb (data->tp_factory,
+                                          n_contacts, empathy_contacts,
+                                          n_failed, failed,
+                                          error,
+                                          data->user_data, weak_object);
+       }
 
-       return contact;
+       contacts_array_free (n_contacts, empathy_contacts);
 }
 
-GList *
+/* The callback is NOT given a reference to the EmpathyContact objects */
+void
 empathy_tp_contact_factory_get_from_handles (EmpathyTpContactFactory *tp_factory,
-                                            const GArray            *handles)
+                                            guint n_handles,
+                                            const TpHandle *handles,
+                                            EmpathyTpContactFactoryContactsByHandleCb callback,
+                                            gpointer                 user_data,
+                                            GDestroyNotify           destroy,
+                                            GObject                 *weak_object)
 {
        EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-       GList                       *contacts = NULL;
-       GArray                      *new_handles;
-       GList                       *new_contacts = NULL;
-       guint                        i;
+       GetContactsData *data;
 
-       g_return_val_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory), NULL);
-       g_return_val_if_fail (handles != NULL, NULL);
+       if (n_handles == 0) {
+               callback (tp_factory, 0, NULL, 0, NULL, NULL, user_data, weak_object);
+               return;
+       }
 
-       /* Search all contacts we already have */
-       new_handles = g_array_new (FALSE, FALSE, sizeof (guint));
-       for (i = 0; i < handles->len; i++) {
-               EmpathyContact *contact;
-               guint           handle;
+       g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
+       g_return_if_fail (handles != NULL);
+
+       data = g_slice_new (GetContactsData);
+       data->callback.handles_cb = callback;
+       data->user_data = user_data;
+       data->destroy = destroy;
+       data->tp_factory = g_object_ref (tp_factory);
+       tp_connection_get_contacts_by_handle (priv->connection,
+                                             n_handles, handles,
+                                             G_N_ELEMENTS (contact_features),
+                                             contact_features,
+                                             get_contacts_by_handle_cb,
+                                             data,
+                                             (GDestroyNotify) get_contacts_data_free,
+                                             weak_object);
+}
 
-               handle = g_array_index (handles, guint, i);
-               if (handle == 0) {
-                       continue;
-               }
+/* The callback is NOT given a reference to the EmpathyContact objects */
+static void
+get_contact_by_handle_cb (TpConnection *connection,
+                         guint n_contacts,
+                         TpContact * const *contacts,
+                         guint n_failed,
+                         const TpHandle *failed,
+                         const GError *error,
+                         gpointer user_data,
+                         GObject *weak_object)
+{
+       GetContactsData *data = user_data;
+       EmpathyContact  *contact = NULL;
+       GError *err = NULL;
 
-               contact = tp_contact_factory_find_by_handle (tp_factory, handle);
-               if (contact) {
-                       contacts = g_list_prepend (contacts, g_object_ref (contact));
-               } else {
-                       g_array_append_val (new_handles, handle);
+       if (n_contacts == 1) {
+               contact = dup_contact_for_tp_contact (data->tp_factory,
+                                                     contacts[0]);
+       }
+       else {
+               if (error == NULL) {
+                       /* tp-glib will provide an error only if the whole operation failed,
+                        * but not if, for example, the handle was invalid. We create an error
+                        * so the caller of empathy_tp_contact_factory_get_from_handle can
+                        * rely on the error to check if the operation succeeded or not. */
+
+                       err = g_error_new_literal (TP_ERRORS, TP_ERROR_INVALID_HANDLE,
+                                                     "handle is invalid");
+               }
+               else {
+                       err = g_error_copy (error);
                }
        }
 
-       if (new_handles->len == 0) {
-               g_array_free (new_handles, TRUE);
-               return contacts;
+       if (data->callback.contact_cb) {
+               data->callback.contact_cb (data->tp_factory,
+                                          contact,
+                                          err,
+                                          data->user_data, weak_object);
        }
 
-       /* Create new contacts */
-       for (i = 0; i < new_handles->len; i++) {
-               EmpathyContact *contact;
-               guint           handle;
+       g_clear_error (&err);
+       if (contact != NULL)
+               g_object_unref (contact);
+}
 
-               handle = g_array_index (new_handles, guint, i);
+void
+empathy_tp_contact_factory_get_from_handle (EmpathyTpContactFactory *tp_factory,
+                                           TpHandle                 handle,
+                                           EmpathyTpContactFactoryContactCb callback,
+                                           gpointer                 user_data,
+                                           GDestroyNotify           destroy,
+                                           GObject                 *weak_object)
+{
+       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
+       GetContactsData *data;
 
-               contact = g_object_new (EMPATHY_TYPE_CONTACT,
-                                       "account", priv->account,
-                                       "handle", handle,
-                                       NULL);
-               tp_contact_factory_add_contact (tp_factory, contact);
-               contacts = g_list_prepend (contacts, contact);
-               new_contacts = g_list_prepend (new_contacts, g_object_ref (contact));
-       }
-       new_contacts = g_list_reverse (new_contacts);
-
-       if (priv->ready) {
-               /* Get the IDs of all new handles */
-               tp_cli_connection_call_inspect_handles (priv->connection,
-                                                       -1,
-                                                       TP_HANDLE_TYPE_CONTACT,
-                                                       new_handles,
-                                                       tp_contact_factory_inspect_handles_cb,
-                                                       new_contacts, tp_contact_factory_list_free,
-                                                       G_OBJECT (tp_factory));
-
-               /* Hold all new handles. */
-               /* FIXME: Should be unholded when removed from the factory */
-               tp_cli_connection_call_hold_handles (priv->connection,
-                                                    -1,
-                                                    TP_HANDLE_TYPE_CONTACT,
-                                                    new_handles,
-                                                    tp_contact_factory_hold_handles_cb,
-                                                    NULL, NULL,
-                                                    G_OBJECT (tp_factory));
-
-               tp_contact_factory_request_everything (tp_factory, new_handles);
-       }
-
-       return contacts;
+       g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
+
+       data = g_slice_new (GetContactsData);
+       data->callback.contact_cb = callback;
+       data->user_data = user_data;
+       data->destroy = destroy;
+       data->tp_factory = g_object_ref (tp_factory);
+       tp_connection_get_contacts_by_handle (priv->connection,
+                                             1, &handle,
+                                             G_N_ELEMENTS (contact_features),
+                                             contact_features,
+                                             get_contact_by_handle_cb,
+                                             data,
+                                             (GDestroyNotify) get_contacts_data_free,
+                                             weak_object);
 }
 
 void
@@ -1068,18 +1251,12 @@ empathy_tp_contact_factory_set_alias (EmpathyTpContactFactory *tp_factory,
 
        g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
        g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-       g_return_if_fail (empathy_account_equal (empathy_contact_get_account (contact),
-                                                priv->account));
-
-       if (!priv->ready) {
-               return;
-       }
 
        handle = empathy_contact_get_handle (contact);
 
-       empathy_debug (DEBUG_DOMAIN, "Setting alias for contact %s (%d) to %s",
-                      empathy_contact_get_id (contact),
-                      handle, alias);
+       DEBUG ("Setting alias for contact %s (%d) to %s",
+               empathy_contact_get_id (contact),
+               handle, alias);
 
        new_alias = g_hash_table_new_full (g_direct_hash,
                                           g_direct_equal,
@@ -1110,18 +1287,14 @@ empathy_tp_contact_factory_set_avatar (EmpathyTpContactFactory *tp_factory,
 
        g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
 
-       if (!priv->ready) {
-               return;
-       }
-
        if (data && size > 0 && size < G_MAXUINT) {
                GArray avatar;
 
-               avatar.data = (gchar*) data;
+               avatar.data = (gchar *) data;
                avatar.len = size;
 
-               empathy_debug (DEBUG_DOMAIN, "Setting avatar on account %s",
-                              mc_account_get_unique_name (priv->account));
+               DEBUG ("Setting avatar on connection %s",
+                       tp_proxy_get_object_path (TP_PROXY (priv->connection)));
 
                tp_cli_connection_interface_avatars_call_set_avatar (priv->connection,
                                                                     -1,
@@ -1131,8 +1304,8 @@ empathy_tp_contact_factory_set_avatar (EmpathyTpContactFactory *tp_factory,
                                                                     NULL, NULL,
                                                                     G_OBJECT (tp_factory));
        } else {
-               empathy_debug (DEBUG_DOMAIN, "Clearing avatar on account %s",
-                              mc_account_get_unique_name (priv->account));
+               DEBUG ("Clearing avatar on connection %s",
+                       tp_proxy_get_object_path (TP_PROXY (priv->connection)));
 
                tp_cli_connection_interface_avatars_call_clear_avatar (priv->connection,
                                                                       -1,
@@ -1142,6 +1315,24 @@ empathy_tp_contact_factory_set_avatar (EmpathyTpContactFactory *tp_factory,
        }
 }
 
+void
+empathy_tp_contact_factory_set_location (EmpathyTpContactFactory *tp_factory,
+                                        GHashTable              *location)
+{
+       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
+
+       g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
+
+       DEBUG ("Setting location");
+
+       tp_cli_connection_interface_location_call_set_location (priv->connection,
+                                                                -1,
+                                                                location,
+                                                                tp_contact_factory_set_location_cb,
+                                                                NULL, NULL,
+                                                                G_OBJECT (tp_factory));
+}
+
 static void
 tp_contact_factory_get_property (GObject    *object,
                                 guint       param_id,
@@ -1151,8 +1342,26 @@ tp_contact_factory_get_property (GObject    *object,
        EmpathyTpContactFactoryPriv *priv = GET_PRIV (object);
 
        switch (param_id) {
-       case PROP_ACCOUNT:
-               g_value_set_object (value, priv->account);
+       case PROP_CONNECTION:
+               g_value_set_object (value, priv->connection);
+               break;
+       case PROP_MIME_TYPES:
+               g_value_set_boxed (value, priv->avatar_mime_types);
+               break;
+       case PROP_MIN_WIDTH:
+               g_value_set_uint (value, priv->avatar_min_width);
+               break;
+       case PROP_MIN_HEIGHT:
+               g_value_set_uint (value, priv->avatar_min_height);
+               break;
+       case PROP_MAX_WIDTH:
+               g_value_set_uint (value, priv->avatar_max_width);
+               break;
+       case PROP_MAX_HEIGHT:
+               g_value_set_uint (value, priv->avatar_max_height);
+               break;
+       case PROP_MAX_SIZE:
+               g_value_set_uint (value, priv->avatar_max_size);
                break;
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -1169,8 +1378,8 @@ tp_contact_factory_set_property (GObject      *object,
        EmpathyTpContactFactoryPriv *priv = GET_PRIV (object);
 
        switch (param_id) {
-       case PROP_ACCOUNT:
-               priv->account = g_object_ref (g_value_get_object (value));
+       case PROP_CONNECTION:
+               priv->connection = g_value_dup_object (value);
                break;
        default:
                G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
@@ -1184,14 +1393,7 @@ tp_contact_factory_finalize (GObject *object)
        EmpathyTpContactFactoryPriv *priv = GET_PRIV (object);
        GList                       *l;
 
-       empathy_debug (DEBUG_DOMAIN, "Finalized: %p (%s)",
-                      object,
-                      mc_account_get_normalized_name (priv->account));
-
-       dbus_g_proxy_disconnect_signal (DBUS_G_PROXY (priv->mc),
-                                       "AccountStatusChanged",
-                                       G_CALLBACK (tp_contact_factory_status_changed_cb),
-                                       object);
+       DEBUG ("Finalized: %p", object);
 
        for (l = priv->contacts; l; l = l->next) {
                g_object_weak_unref (G_OBJECT (l->data),
@@ -1200,20 +1402,88 @@ tp_contact_factory_finalize (GObject *object)
        }
 
        g_list_free (priv->contacts);
-       g_object_unref (priv->mc);
-       g_object_unref (priv->account);
-       g_object_unref (priv->user);
 
-       if (priv->connection) {
-               g_signal_handlers_disconnect_by_func (priv->connection,
-                                                     tp_contact_factory_connection_invalidated_cb,
-                                                     object);
-               g_object_unref (priv->connection);
-       }
+       g_object_unref (priv->connection);
+
+       g_strfreev (priv->avatar_mime_types);
 
        G_OBJECT_CLASS (empathy_tp_contact_factory_parent_class)->finalize (object);
 }
 
+static void
+tp_contact_factory_contact_capabilities_changed_cb (TpConnection *connection,
+                                                   GHashTable *caps,
+                                                   gpointer user_data,
+                                                   GObject *weak_object)
+{
+       EmpathyTpContactFactory *self = EMPATHY_TP_CONTACT_FACTORY (weak_object);
+
+       update_contact_capabilities (self, caps);
+}
+
+static void
+connection_ready_cb (TpConnection *connection,
+                               const GError *error,
+                               gpointer user_data)
+{
+       EmpathyTpContactFactory *tp_factory = EMPATHY_TP_CONTACT_FACTORY (user_data);
+       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
+
+       if (error != NULL)
+               goto out;
+
+       /* FIXME: This should be moved to TpContact */
+       tp_cli_connection_interface_avatars_connect_to_avatar_updated (priv->connection,
+                                                                      tp_contact_factory_avatar_updated_cb,
+                                                                      NULL, NULL,
+                                                                      G_OBJECT (tp_factory),
+                                                                      NULL);
+       tp_cli_connection_interface_avatars_connect_to_avatar_retrieved (priv->connection,
+                                                                        tp_contact_factory_avatar_retrieved_cb,
+                                                                        NULL, NULL,
+                                                                        G_OBJECT (tp_factory),
+                                                                        NULL);
+
+       if (tp_proxy_has_interface_by_id (connection,
+                               TP_IFACE_QUARK_CONNECTION_INTERFACE_CONTACT_CAPABILITIES)) {
+               priv->contact_caps_supported = TRUE;
+
+               tp_cli_connection_interface_contact_capabilities_connect_to_contact_capabilities_changed (
+                       priv->connection, tp_contact_factory_contact_capabilities_changed_cb,
+                       NULL, NULL, G_OBJECT (tp_factory), NULL);
+       }
+       else {
+               tp_cli_connection_interface_capabilities_connect_to_capabilities_changed (priv->connection,
+                                                                                         tp_contact_factory_capabilities_changed_cb,
+                                                                                         NULL, NULL,
+                                                                                         G_OBJECT (tp_factory),
+                                                                                         NULL);
+       }
+
+       tp_cli_connection_interface_location_connect_to_location_updated (priv->connection,
+                                                                          tp_contact_factory_location_updated_cb,
+                                                                          NULL, NULL,
+                                                                          G_OBJECT (tp_factory),
+                                                                          NULL);
+
+       tp_cli_connection_interface_avatars_call_get_avatar_requirements (priv->connection,
+                                                                         -1,
+                                                                         tp_contact_factory_got_avatar_requirements_cb,
+                                                                         NULL, NULL,
+                                                                         G_OBJECT (tp_factory));
+
+       if (!priv->contact_caps_supported) {
+               tp_cli_dbus_properties_call_get (priv->connection, -1,
+                       TP_IFACE_CONNECTION_INTERFACE_REQUESTS,
+                       "RequestableChannelClasses",
+                       get_requestable_channel_classes_cb, NULL, NULL,
+                       G_OBJECT (tp_factory));
+       }
+
+out:
+       g_object_unref (tp_factory);
+}
+
 static GObject *
 tp_contact_factory_constructor (GType                  type,
                                guint                  n_props,
@@ -1225,11 +1495,11 @@ tp_contact_factory_constructor (GType                  type,
        tp_factory = G_OBJECT_CLASS (empathy_tp_contact_factory_parent_class)->constructor (type, n_props, props);
        priv = GET_PRIV (tp_factory);
 
-       priv->ready = FALSE;
-       priv->user = empathy_contact_new (priv->account);
-       empathy_contact_set_is_user (priv->user, TRUE);
-       tp_contact_factory_add_contact ((EmpathyTpContactFactory*) tp_factory, priv->user);
-       tp_contact_factory_status_updated (EMPATHY_TP_CONTACT_FACTORY (tp_factory));
+       /* Ensure to keep the self object alive while the call_when_ready is
+        * running */
+       g_object_ref (tp_factory);
+       tp_connection_call_when_ready (priv->connection, connection_ready_cb,
+               tp_factory);
 
        return tp_factory;
 }
@@ -1244,15 +1514,78 @@ empathy_tp_contact_factory_class_init (EmpathyTpContactFactoryClass *klass)
        object_class->get_property = tp_contact_factory_get_property;
        object_class->set_property = tp_contact_factory_set_property;
 
-       /* Construct-only properties */
        g_object_class_install_property (object_class,
-                                        PROP_ACCOUNT,
-                                        g_param_spec_object ("account",
-                                                             "Factory's Account",
-                                                             "The account associated with the factory",
-                                                             MC_TYPE_ACCOUNT,
+                                        PROP_CONNECTION,
+                                        g_param_spec_object ("connection",
+                                                             "Factory's Connection",
+                                                             "The connection associated with the factory",
+                                                             TP_TYPE_CONNECTION,
                                                              G_PARAM_READWRITE |
-                                                             G_PARAM_CONSTRUCT_ONLY));
+                                                             G_PARAM_CONSTRUCT_ONLY |
+                                                             G_PARAM_STATIC_STRINGS));
+       g_object_class_install_property (object_class,
+                                        PROP_MIME_TYPES,
+                                        g_param_spec_boxed ("avatar-mime-types",
+                                                            "Supported MIME types for avatars",
+                                                            "Types of images that may be set as "
+                                                            "avatars on this connection.",
+                                                            G_TYPE_STRV,
+                                                            G_PARAM_READABLE |
+                                                            G_PARAM_STATIC_STRINGS));
+       g_object_class_install_property (object_class,
+                                        PROP_MIN_WIDTH,
+                                        g_param_spec_uint ("avatar-min-width",
+                                                           "Minimum width for avatars",
+                                                           "Minimum width of avatar that may be set.",
+                                                           0,
+                                                           G_MAXUINT,
+                                                           0,
+                                                           G_PARAM_READABLE |
+                                                           G_PARAM_STATIC_STRINGS));
+       g_object_class_install_property (object_class,
+                                        PROP_MIN_HEIGHT,
+                                        g_param_spec_uint ("avatar-min-height",
+                                                           "Minimum height for avatars",
+                                                           "Minimum height of avatar that may be set.",
+                                                           0,
+                                                           G_MAXUINT,
+                                                           0,
+                                                           G_PARAM_READABLE |
+                                                           G_PARAM_STATIC_STRINGS));
+       g_object_class_install_property (object_class,
+                                        PROP_MAX_WIDTH,
+                                        g_param_spec_uint ("avatar-max-width",
+                                                           "Maximum width for avatars",
+                                                           "Maximum width of avatar that may be set "
+                                                           "or 0 if there is no maximum.",
+                                                           0,
+                                                           G_MAXUINT,
+                                                           0,
+                                                           G_PARAM_READABLE |
+                                                           G_PARAM_STATIC_STRINGS));
+       g_object_class_install_property (object_class,
+                                        PROP_MAX_HEIGHT,
+                                        g_param_spec_uint ("avatar-max-height",
+                                                           "Maximum height for avatars",
+                                                           "Maximum height of avatar that may be set "
+                                                           "or 0 if there is no maximum.",
+                                                           0,
+                                                           G_MAXUINT,
+                                                           0,
+                                                           G_PARAM_READABLE |
+                                                           G_PARAM_STATIC_STRINGS));
+       g_object_class_install_property (object_class,
+                                        PROP_MAX_SIZE,
+                                        g_param_spec_uint ("avatar-max-size",
+                                                           "Maximum size for avatars in bytes",
+                                                           "Maximum file size of avatar that may be "
+                                                           "set or 0 if there is no maximum.",
+                                                           0,
+                                                           G_MAXUINT,
+                                                           0,
+                                                           G_PARAM_READABLE |
+                                                           G_PARAM_STATIC_STRINGS));
+
 
        g_type_class_add_private (object_class, sizeof (EmpathyTpContactFactoryPriv));
 }
@@ -1260,20 +1593,74 @@ empathy_tp_contact_factory_class_init (EmpathyTpContactFactoryClass *klass)
 static void
 empathy_tp_contact_factory_init (EmpathyTpContactFactory *tp_factory)
 {
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
+       EmpathyTpContactFactoryPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (tp_factory,
+               EMPATHY_TYPE_TP_CONTACT_FACTORY, EmpathyTpContactFactoryPriv);
+
+       tp_factory->priv = priv;
+       priv->can_request_ft = FALSE;
+       priv->can_request_st = FALSE;
+       priv->contact_caps_supported = FALSE;
+}
+
+static GHashTable *factories = NULL;
 
-       priv->mc = empathy_mission_control_new ();
-       dbus_g_proxy_connect_signal (DBUS_G_PROXY (priv->mc),
-                                    "AccountStatusChanged",
-                                    G_CALLBACK (tp_contact_factory_status_changed_cb),
-                                    tp_factory, NULL);
+static void
+tp_contact_factory_connection_invalidated_cb (TpProxy *connection,
+                                             guint    domain,
+                                             gint     code,
+                                             gchar   *message,
+                                             gpointer user_data)
+{
+       DEBUG ("Message: %s", message);
+       g_hash_table_remove (factories, connection);
+}
+
+static void
+tp_contact_factory_connection_weak_notify_cb (gpointer connection,
+                                             GObject *where_the_object_was)
+{
+       g_hash_table_remove (factories, connection);
+}
+
+static void
+tp_contact_factory_remove_connection (gpointer connection)
+{
+       g_signal_handlers_disconnect_by_func (connection,
+               tp_contact_factory_connection_invalidated_cb, NULL);
+       g_object_unref (connection);
 }
 
 EmpathyTpContactFactory *
-empathy_tp_contact_factory_new (McAccount *account)
+empathy_tp_contact_factory_dup_singleton (TpConnection *connection)
 {
-       return g_object_new (EMPATHY_TYPE_TP_CONTACT_FACTORY,
-                            "account", account,
-                            NULL);
+       EmpathyTpContactFactory *tp_factory;
+
+       g_return_val_if_fail (TP_IS_CONNECTION (connection), NULL);
+
+       if (factories == NULL) {
+               factories = g_hash_table_new_full (empathy_proxy_hash,
+                                                  empathy_proxy_equal,
+                                                  tp_contact_factory_remove_connection,
+                                                  NULL);
+       }
+
+       tp_factory = g_hash_table_lookup (factories, connection);
+       if (tp_factory == NULL) {
+               tp_factory = g_object_new (EMPATHY_TYPE_TP_CONTACT_FACTORY,
+                                          "connection", connection,
+                                          NULL);
+               g_hash_table_insert (factories, g_object_ref (connection),
+                                    tp_factory);
+               g_object_weak_ref (G_OBJECT (tp_factory),
+                                  tp_contact_factory_connection_weak_notify_cb,
+                                  connection);
+               g_signal_connect (connection, "invalidated",
+                                 G_CALLBACK (tp_contact_factory_connection_invalidated_cb),
+                                 NULL);
+       } else {
+               g_object_ref (tp_factory);
+       }
+
+       return tp_factory;
 }