]> git.0d.be Git - empathy.git/blobdiff - libempathy/empathy-tp-contact-factory.c
local-xmpp-assistant-widget: increase row-spacing
[empathy.git] / libempathy / empathy-tp-contact-factory.c
index 7735b0f1a19344d16da0573ccc33ca31779e8301..681c882eec72e6753eba8af23c6824bb7bf62a59 100644 (file)
  * 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 <config.h>
 
-#include <string.h>
-
-#include <telepathy-glib/util.h>
-#include <telepathy-glib/gtypes.h>
-
-#include <extensions/extensions.h>
-
 #include "empathy-tp-contact-factory.h"
-#include "empathy-utils.h"
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TP | EMPATHY_DEBUG_CONTACT
 #include "empathy-debug.h"
 
-#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyTpContactFactory)
-typedef struct {
-       TpConnection   *connection;
-       GList          *contacts;
-
-       gchar         **avatar_mime_types;
-       guint           avatar_min_width;
-       guint           avatar_min_height;
-       guint           avatar_max_width;
-       guint           avatar_max_height;
-       guint           avatar_max_size;
-       gboolean        can_request_ft;
-} EmpathyTpContactFactoryPriv;
-
-G_DEFINE_TYPE (EmpathyTpContactFactory, empathy_tp_contact_factory, G_TYPE_OBJECT);
-
-enum {
-       PROP_0,
-       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_AVATAR_DATA,
        TP_CONTACT_FEATURE_PRESENCE,
+       TP_CONTACT_FEATURE_LOCATION,
+       TP_CONTACT_FEATURE_CAPABILITIES,
+       TP_CONTACT_FEATURE_CLIENT_TYPES,
 };
 
-static EmpathyContact *
-tp_contact_factory_find_by_handle (EmpathyTpContactFactory *tp_factory,
-                                  guint                    handle)
-{
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-       GList                       *l;
-
-       for (l = priv->contacts; l; l = l->next) {
-               if (empathy_contact_get_handle (l->data) == handle) {
-                       return l->data;
-               }
-       }
-
-       return NULL;
-}
-
-static EmpathyContact *
-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 (empathy_contact_get_tp_contact (l->data) == tp_contact) {
-                       return l->data;
-               }
-       }
-
-       return NULL;
-}
-
-static void
-tp_contact_factory_weak_notify (gpointer data,
-                               GObject *where_the_object_was)
-{
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (data);
-
-       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_set_aliases_cb (TpConnection *connection,
-                                  const GError *error,
-                                  gpointer      user_data,
-                                  GObject      *tp_factory)
-{
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-       }
-}
-
-static void
-tp_contact_factory_set_avatar_cb (TpConnection *connection,
-                                 const gchar  *token,
-                                 const GError *error,
-                                 gpointer      user_data,
-                                 GObject      *tp_factory)
-{
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-       }
-}
-
-static void
-tp_contact_factory_clear_avatar_cb (TpConnection *connection,
-                                   const GError *error,
-                                   gpointer      user_data,
-                                   GObject      *tp_factory)
-{
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-       }
-}
-
-static void
-tp_contact_factory_avatar_retrieved_cb (TpConnection *connection,
-                                       guint         handle,
-                                       const gchar  *token,
-                                       const GArray *avatar_data,
-                                       const gchar  *mime_type,
-                                       gpointer      user_data,
-                                       GObject      *tp_factory)
-{
-       EmpathyContact *contact;
-
-       contact = tp_contact_factory_find_by_handle (EMPATHY_TP_CONTACT_FACTORY (tp_factory),
-                                                    handle);
-       if (!contact) {
-               return;
-       }
-
-       DEBUG ("Avatar retrieved for contact %s (%d)",
-               empathy_contact_get_id (contact),
-               handle);
-
-       empathy_contact_load_avatar_data (contact,
-                                         avatar_data->data,
-                                         avatar_data->len,
-                                         mime_type,
-                                         token);
-}
-
-static void
-tp_contact_factory_request_avatars_cb (TpConnection *connection,
-                                      const GError *error,
-                                      gpointer      user_data,
-                                      GObject      *tp_factory)
-{
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-       }
-}
-
-static gboolean
-tp_contact_factory_avatar_maybe_update (EmpathyTpContactFactory *tp_factory,
-                                       guint                    handle,
-                                       const gchar             *token)
-{
-       EmpathyContact *contact;
-       EmpathyAvatar  *avatar;
-
-       contact = tp_contact_factory_find_by_handle (tp_factory, handle);
-       if (!contact) {
-               return TRUE;
-       }
-
-       /* Check if we have an avatar */
-       if (EMP_STR_EMPTY (token)) {
-               empathy_contact_set_avatar (contact, NULL);
-               return TRUE;
-       }
-
-       /* Check if the avatar changed */
-       avatar = empathy_contact_get_avatar (contact);
-       if (avatar && !tp_strdiff (avatar->token, token)) {
-               return TRUE;
-       }
-
-       /* The avatar changed, search the new one in the cache */
-       if (empathy_contact_load_avatar_cache (contact, token)) {
-               /* Got from cache, use it */
-               return TRUE;
-       }
-
-       /* Avatar is not up-to-date, we have to request it. */
-       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_got_known_avatar_tokens (EmpathyTpContactFactory *tp_factory,
-                                           GHashTable              *tokens,
-                                           const GError            *error)
-{
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-       TokensData data;
-
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-               return;
-       }
-
-       data.tp_factory = tp_factory;
-       data.handles = g_array_new (FALSE, FALSE, sizeof (guint));
-       g_hash_table_foreach (tokens,
-                             tp_contact_factory_avatar_tokens_foreach,
-                             &data);
-
-       DEBUG ("Got %d tokens, need to request %d avatars",
-               g_hash_table_size (tokens), data.handles->len);
-
-       /* Request needed avatars */
-       if (data.handles->len > 0) {
-               tp_cli_connection_interface_avatars_call_request_avatars (priv->connection,
-                                                                         -1,
-                                                                         data.handles,
-                                                                         tp_contact_factory_request_avatars_cb,
-                                                                         NULL, NULL,
-                                                                         G_OBJECT (tp_factory));
-       }
-
-       g_array_free (data.handles, TRUE);
-       g_hash_table_destroy (tokens);
-}
-
-static void
-tp_contact_factory_avatar_updated_cb (TpConnection *connection,
-                                     guint         handle,
-                                     const gchar  *new_token,
-                                     gpointer      user_data,
-                                     GObject      *tp_factory)
-{
-       GArray *handles;
-
-       if (tp_contact_factory_avatar_maybe_update (EMPATHY_TP_CONTACT_FACTORY (tp_factory),
-                                                   handle, new_token)) {
-               /* Avatar was cached, nothing to do */
-               return;
-       }
-
-       DEBUG ("Need to request avatar for token %s", new_token);
-
-       handles = g_array_new (FALSE, FALSE, sizeof (guint));
-       g_array_append_val (handles, handle);
-
-       tp_cli_connection_interface_avatars_call_request_avatars (connection,
-                                                                 -1,
-                                                                 handles,
-                                                                 tp_contact_factory_request_avatars_cb,
-                                                                 NULL, NULL,
-                                                                 tp_factory);
-       g_array_free (handles, TRUE);
-}
-
-static void
-tp_contact_factory_update_capabilities (EmpathyTpContactFactory *tp_factory,
-                                       guint                    handle,
-                                       const gchar             *channel_type,
-                                       guint                    generic,
-                                       guint                    specific)
-{
-       EmpathyContact      *contact;
-       EmpathyCapabilities  capabilities;
-
-       contact = tp_contact_factory_find_by_handle (tp_factory, handle);
-       if (!contact) {
-               return;
-       }
-
-       capabilities = empathy_contact_get_capabilities (contact);
-       capabilities &= ~EMPATHY_CAPABILITIES_UNKNOWN;
-
-       if (strcmp (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA) == 0) {
-               capabilities &= ~EMPATHY_CAPABILITIES_AUDIO;
-               capabilities &= ~EMPATHY_CAPABILITIES_VIDEO;
-               if (specific & TP_CHANNEL_MEDIA_CAPABILITY_AUDIO) {
-                       capabilities |= EMPATHY_CAPABILITIES_AUDIO;
-               }
-               if (specific & TP_CHANNEL_MEDIA_CAPABILITY_VIDEO) {
-                       capabilities |= EMPATHY_CAPABILITIES_VIDEO;
-               }
-       }
-
-       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_got_capabilities (EmpathyTpContactFactory *tp_factory,
-                                    GPtrArray *capabilities,
-                                    const GError    *error)
-{
-       guint i;
-
-       if (error) {
-               DEBUG ("Error: %s", error->message);
-               /* FIXME Should set the capabilities of the contacts for which this request
-                * originated to NONE */
-               return;
-       }
-
-       for (i = 0; i < capabilities->len; i++) {
-               GValueArray *values;
-               guint        handle;
-               const gchar *channel_type;
-               guint        generic;
-               guint        specific;
-
-               values = g_ptr_array_index (capabilities, i);
-               handle = g_value_get_uint (g_value_array_get_nth (values, 0));
-               channel_type = g_value_get_string (g_value_array_get_nth (values, 1));
-               generic = g_value_get_uint (g_value_array_get_nth (values, 2));
-               specific = g_value_get_uint (g_value_array_get_nth (values, 3));
-
-               tp_contact_factory_update_capabilities (tp_factory,
-                                                       handle,
-                                                       channel_type,
-                                                       generic,
-                                                       specific);
-
-               g_value_array_free (values);
-       }
-
-       g_ptr_array_free (capabilities, TRUE);
-}
-
-static void
-tp_contact_factory_capabilities_changed_cb (TpConnection    *connection,
-                                           const GPtrArray *capabilities,
-                                           gpointer         user_data,
-                                           GObject         *weak_object)
-{
-       EmpathyTpContactFactory *tp_factory = EMPATHY_TP_CONTACT_FACTORY (weak_object);
-       guint                    i;
-
-       for (i = 0; i < capabilities->len; i++) {
-               GValueArray *values;
-               guint        handle;
-               const gchar *channel_type;
-               guint        generic;
-               guint        specific;
-
-               values = g_ptr_array_index (capabilities, i);
-               handle = g_value_get_uint (g_value_array_get_nth (values, 0));
-               channel_type = g_value_get_string (g_value_array_get_nth (values, 1));
-               generic = g_value_get_uint (g_value_array_get_nth (values, 3));
-               specific = g_value_get_uint (g_value_array_get_nth (values, 5));
-
-               tp_contact_factory_update_capabilities (tp_factory,
-                                                       handle,
-                                                       channel_type,
-                                                       generic,
-                                                       specific);
-       }
-}
-
-static void
-get_requestable_channel_classes_cb (TpProxy *connection,
-                                   const GValue *value,
-                                   const GError *error,
-                                   gpointer user_data,
-                                   GObject *weak_object)
-{
-       EmpathyTpContactFactory     *self = EMPATHY_TP_CONTACT_FACTORY (weak_object);
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (self);
-       GPtrArray                   *classes;
-       guint                        i;
-
-       if (error != NULL) {
-               DEBUG ("Error: %s", error->message);
-               return;
-       }
-
-       classes = g_value_get_boxed (value);
-       for (i = 0; i < classes->len; i++) {
-               GValueArray *class_struct;
-               GHashTable *fixed_prop;
-               GValue *chan_type, *handle_type;
-               GList *l;
-
-               class_struct = g_ptr_array_index (classes, i);
-               fixed_prop = g_value_get_boxed (g_value_array_get_nth (class_struct, 0));
-
-               chan_type = g_hash_table_lookup (fixed_prop,
-                       TP_IFACE_CHANNEL ".ChannelType");
-               if (chan_type == NULL ||
-                   tp_strdiff (g_value_get_string (chan_type),
-                               TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) {
-                       continue;
-               }
-
-               handle_type = g_hash_table_lookup (fixed_prop,
-                       TP_IFACE_CHANNEL ".TargetHandleType");
-               if (handle_type == NULL ||
-                   g_value_get_uint (handle_type) != TP_HANDLE_TYPE_CONTACT) {
-                       continue;
-               }
-
-               /* We can request file transfer channel to contacts. */
-               priv->can_request_ft = TRUE;
-
-               /* 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);
-                       empathy_contact_set_capabilities (contact, caps |
-                               EMPATHY_CAPABILITIES_FT);
-               }
-               break;
-       }
-}
-
-static void
-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)
-{
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-
-       if (error) {
-               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_add_contact (EmpathyTpContactFactory *tp_factory,
-                               EmpathyContact          *contact)
-{
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-       TpHandle self_handle;
-       TpHandle handle;
-       GArray handles = {(gchar*) &handle, 1};
-       GHashTable *tokens;
-       GPtrArray *capabilities;
-       GError *error = NULL;
-
-       /* 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);
-
-       /* 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);
-
-       /* Set the FT capability */
-       if (priv->can_request_ft) {
-               EmpathyCapabilities caps;
-
-               caps = empathy_contact_get_capabilities (contact);
-               caps |= EMPATHY_CAPABILITIES_FT;
-
-               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 */
-       tp_cli_connection_interface_avatars_run_get_known_avatar_tokens (priv->connection,
-                                                                        -1,
-                                                                        &handles,
-                                                                        &tokens,
-                                                                        &error,
-                                                                        NULL);
-       tp_contact_factory_got_known_avatar_tokens (tp_factory, tokens, error);
-       g_clear_error (&error);
-
-       tp_cli_connection_interface_capabilities_run_get_capabilities (priv->connection,
-                                                                       -1,
-                                                                       &handles,
-                                                                       &capabilities,
-                                                                       &error,
-                                                                       NULL);
-       tp_contact_factory_got_capabilities (tp_factory, capabilities, error);
-       g_clear_error (&error);
-
-       DEBUG ("Contact added: %s (%d)",
-               empathy_contact_get_id (contact),
-               empathy_contact_get_handle (contact));
-}
-
 typedef union {
        EmpathyTpContactFactoryContactsByIdCb ids_cb;
        EmpathyTpContactFactoryContactsByHandleCb handles_cb;
@@ -568,7 +42,7 @@ typedef union {
 } GetContactsCb;
 
 typedef struct {
-       EmpathyTpContactFactory *tp_factory;
+        TpConnection *connection;
        GetContactsCb callback;
        gpointer user_data;
        GDestroyNotify destroy;
@@ -582,41 +56,21 @@ get_contacts_data_free (gpointer user_data)
        if (data->destroy) {
                data->destroy (data->user_data);
        }
-       g_object_unref (data->tp_factory);
+       g_object_unref (data->connection);
 
        g_slice_free (GetContactsData, data);
 }
 
-static EmpathyContact *
-dup_contact_for_tp_contact (EmpathyTpContactFactory *tp_factory,
-                           TpContact               *tp_contact)
-{
-       EmpathyContact *contact;
-
-       contact = tp_contact_factory_find_by_tp_contact (tp_factory,
-                                                        tp_contact);
-
-       if (contact != NULL) {
-               g_object_ref (contact);
-       } else {
-               contact = empathy_contact_new (tp_contact);
-               tp_contact_factory_add_contact (tp_factory, contact);
-       }
-
-       return contact;
-}
-
 static EmpathyContact **
-contacts_array_new (EmpathyTpContactFactory *tp_factory,
-                   guint                    n_contacts,
-                   TpContact * const *      contacts)
+contacts_array_new (guint n_contacts,
+                   TpContact * const * contacts)
 {
        EmpathyContact **ret;
        guint            i;
 
        ret = g_new0 (EmpathyContact *, n_contacts);
        for (i = 0; i < n_contacts; i++) {
-               ret[i] = dup_contact_for_tp_contact (tp_factory, contacts[i]);
+               ret[i] = empathy_contact_dup_from_tp_contact (contacts[i]);
        }
 
        return ret;
@@ -647,10 +101,9 @@ get_contacts_by_id_cb (TpConnection *connection,
        GetContactsData *data = user_data;
        EmpathyContact **empathy_contacts;
 
-       empathy_contacts = contacts_array_new (data->tp_factory,
-                                              n_contacts, contacts);
+       empathy_contacts = contacts_array_new (n_contacts, contacts);
        if (data->callback.ids_cb) {
-               data->callback.ids_cb (data->tp_factory,
+               data->callback.ids_cb (data->connection,
                                       n_contacts, empathy_contacts,
                                       requested_ids,
                                       failed_id_errors,
@@ -661,8 +114,9 @@ get_contacts_by_id_cb (TpConnection *connection,
        contacts_array_free (n_contacts, empathy_contacts);
 }
 
+/* The callback is NOT given a reference to the EmpathyContact objects */
 void
-empathy_tp_contact_factory_get_from_ids (EmpathyTpContactFactory *tp_factory,
+empathy_tp_contact_factory_get_from_ids (TpConnection            *connection,
                                         guint                    n_ids,
                                         const gchar * const     *ids,
                                         EmpathyTpContactFactoryContactsByIdCb callback,
@@ -670,18 +124,17 @@ empathy_tp_contact_factory_get_from_ids (EmpathyTpContactFactory *tp_factory,
                                         GDestroyNotify           destroy,
                                         GObject                 *weak_object)
 {
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
        GetContactsData *data;
 
-       g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
+       g_return_if_fail (TP_IS_CONNECTION (connection));
        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,
+       data->connection = g_object_ref (connection);
+       tp_connection_get_contacts_by_id (connection,
                                          n_ids, ids,
                                          G_N_ELEMENTS (contact_features),
                                          contact_features,
@@ -705,8 +158,7 @@ get_contact_by_id_cb (TpConnection *connection,
        EmpathyContact  *contact = NULL;
 
        if (n_contacts == 1) {
-               contact = dup_contact_for_tp_contact (data->tp_factory,
-                                                     contacts[0]);
+               contact = empathy_contact_dup_from_tp_contact (contacts[0]);
        }
        else if (error == NULL) {
                GHashTableIter iter;
@@ -722,33 +174,36 @@ get_contact_by_id_cb (TpConnection *connection,
        }
 
        if (data->callback.contact_cb) {
-               data->callback.contact_cb (data->tp_factory,
+               data->callback.contact_cb (data->connection,
                                           contact,
                                           error,
                                           data->user_data, weak_object);
        }
+
+       if (contact != NULL)
+               g_object_unref (contact);
 }
 
+/* The callback is NOT given a reference to the EmpathyContact objects */
 void
-empathy_tp_contact_factory_get_from_id (EmpathyTpContactFactory *tp_factory,
+empathy_tp_contact_factory_get_from_id (TpConnection            *connection,
                                        const gchar             *id,
                                        EmpathyTpContactFactoryContactCb callback,
                                        gpointer                 user_data,
                                        GDestroyNotify           destroy,
                                        GObject                 *weak_object)
 {
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
        GetContactsData *data;
 
-       g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
+       g_return_if_fail (TP_IS_CONNECTION (connection));
        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,
+       data->connection = g_object_ref (connection);
+       tp_connection_get_contacts_by_id (connection,
                                          1, &id,
                                          G_N_ELEMENTS (contact_features),
                                          contact_features,
@@ -771,10 +226,9 @@ get_contacts_by_handle_cb (TpConnection *connection,
        GetContactsData *data = user_data;
        EmpathyContact **empathy_contacts;
 
-       empathy_contacts = contacts_array_new (data->tp_factory,
-                                              n_contacts, contacts);
+       empathy_contacts = contacts_array_new (n_contacts, contacts);
        if (data->callback.handles_cb) {
-               data->callback.handles_cb (data->tp_factory,
+               data->callback.handles_cb (data->connection,
                                           n_contacts, empathy_contacts,
                                           n_failed, failed,
                                           error,
@@ -784,8 +238,9 @@ get_contacts_by_handle_cb (TpConnection *connection,
        contacts_array_free (n_contacts, empathy_contacts);
 }
 
+/* The callback is NOT given a reference to the EmpathyContact objects */
 void
-empathy_tp_contact_factory_get_from_handles (EmpathyTpContactFactory *tp_factory,
+empathy_tp_contact_factory_get_from_handles (TpConnection *connection,
                                             guint n_handles,
                                             const TpHandle *handles,
                                             EmpathyTpContactFactoryContactsByHandleCb callback,
@@ -793,18 +248,22 @@ empathy_tp_contact_factory_get_from_handles (EmpathyTpContactFactory *tp_factory
                                             GDestroyNotify           destroy,
                                             GObject                 *weak_object)
 {
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
        GetContactsData *data;
 
-       g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
+       if (n_handles == 0) {
+               callback (connection, 0, NULL, 0, NULL, NULL, user_data, weak_object);
+               return;
+       }
+
+       g_return_if_fail (TP_IS_CONNECTION (connection));
        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,
+       data->connection = g_object_ref (connection);
+       tp_connection_get_contacts_by_handle (connection,
                                              n_handles, handles,
                                              G_N_ELEMENTS (contact_features),
                                              contact_features,
@@ -814,6 +273,7 @@ empathy_tp_contact_factory_get_from_handles (EmpathyTpContactFactory *tp_factory
                                              weak_object);
 }
 
+/* The callback is NOT given a reference to the EmpathyContact objects */
 static void
 get_contact_by_handle_cb (TpConnection *connection,
                          guint n_contacts,
@@ -826,39 +286,56 @@ get_contact_by_handle_cb (TpConnection *connection,
 {
        GetContactsData *data = user_data;
        EmpathyContact  *contact = NULL;
+       GError *err = NULL;
 
        if (n_contacts == 1) {
-               contact = dup_contact_for_tp_contact (data->tp_factory,
-                                                     contacts[0]);
+               contact = empathy_contact_dup_from_tp_contact (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 (data->callback.contact_cb) {
-               data->callback.contact_cb (data->tp_factory,
+               data->callback.contact_cb (data->connection,
                                           contact,
-                                          error,
+                                          err,
                                           data->user_data, weak_object);
        }
+
+       g_clear_error (&err);
+       if (contact != NULL)
+               g_object_unref (contact);
 }
 
 void
-empathy_tp_contact_factory_get_from_handle (EmpathyTpContactFactory *tp_factory,
+empathy_tp_contact_factory_get_from_handle (TpConnection            *connection,
                                            TpHandle                 handle,
                                            EmpathyTpContactFactoryContactCb callback,
                                            gpointer                 user_data,
                                            GDestroyNotify           destroy,
                                            GObject                 *weak_object)
 {
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
        GetContactsData *data;
 
-       g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
+       g_return_if_fail (TP_IS_CONNECTION (connection));
 
        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,
+       data->connection = g_object_ref (connection);
+       tp_connection_get_contacts_by_handle (connection,
                                              1, &handle,
                                              G_N_ELEMENTS (contact_features),
                                              contact_features,
@@ -868,357 +345,3 @@ empathy_tp_contact_factory_get_from_handle (EmpathyTpContactFactory *tp_factory,
                                              weak_object);
 }
 
-void
-empathy_tp_contact_factory_set_alias (EmpathyTpContactFactory *tp_factory,
-                                     EmpathyContact          *contact,
-                                     const gchar             *alias)
-{
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-       GHashTable                  *new_alias;
-       guint                        handle;
-
-       g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
-       g_return_if_fail (EMPATHY_IS_CONTACT (contact));
-
-       handle = empathy_contact_get_handle (contact);
-
-       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,
-                                          NULL,
-                                          g_free);
-
-       g_hash_table_insert (new_alias,
-                            GUINT_TO_POINTER (handle),
-                            g_strdup (alias));
-
-       tp_cli_connection_interface_aliasing_call_set_aliases (priv->connection,
-                                                              -1,
-                                                              new_alias,
-                                                              tp_contact_factory_set_aliases_cb,
-                                                              NULL, NULL,
-                                                              G_OBJECT (tp_factory));
-
-       g_hash_table_destroy (new_alias);
-}
-
-void
-empathy_tp_contact_factory_set_avatar (EmpathyTpContactFactory *tp_factory,
-                                      const gchar             *data,
-                                      gsize                    size,
-                                      const gchar             *mime_type)
-{
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory);
-
-       g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory));
-
-       if (data && size > 0 && size < G_MAXUINT) {
-               GArray avatar;
-
-               avatar.data = (gchar*) data;
-               avatar.len = size;
-
-               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,
-                                                                    &avatar,
-                                                                    mime_type,
-                                                                    tp_contact_factory_set_avatar_cb,
-                                                                    NULL, NULL,
-                                                                    G_OBJECT (tp_factory));
-       } else {
-               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,
-                                                                      tp_contact_factory_clear_avatar_cb,
-                                                                      NULL, NULL,
-                                                                      G_OBJECT (tp_factory));
-       }
-}
-
-static void
-tp_contact_factory_get_property (GObject    *object,
-                                guint       param_id,
-                                GValue     *value,
-                                GParamSpec *pspec)
-{
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (object);
-
-       switch (param_id) {
-       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);
-               break;
-       };
-}
-
-static void
-tp_contact_factory_set_property (GObject      *object,
-                                guint         param_id,
-                                const GValue *value,
-                                GParamSpec   *pspec)
-{
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (object);
-
-       switch (param_id) {
-       case PROP_CONNECTION:
-               priv->connection = g_value_dup_object (value);
-               break;
-       default:
-               G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-               break;
-       };
-}
-
-static void
-tp_contact_factory_finalize (GObject *object)
-{
-       EmpathyTpContactFactoryPriv *priv = GET_PRIV (object);
-       GList                       *l;
-
-       DEBUG ("Finalized: %p", object);
-
-       for (l = priv->contacts; l; l = l->next) {
-               g_object_weak_unref (G_OBJECT (l->data),
-                                    tp_contact_factory_weak_notify,
-                                    object);
-       }
-
-       g_list_free (priv->contacts);
-
-       g_object_unref (priv->connection);
-
-       g_strfreev (priv->avatar_mime_types);
-
-       G_OBJECT_CLASS (empathy_tp_contact_factory_parent_class)->finalize (object);
-}
-
-static GObject *
-tp_contact_factory_constructor (GType                  type,
-                               guint                  n_props,
-                               GObjectConstructParam *props)
-{
-       GObject *tp_factory;
-       EmpathyTpContactFactoryPriv *priv;
-
-       tp_factory = G_OBJECT_CLASS (empathy_tp_contact_factory_parent_class)->constructor (type, n_props, props);
-       priv = GET_PRIV (tp_factory);
-
-       /* 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,
-                                                                      tp_factory,
-                                                                      NULL);
-       tp_cli_connection_interface_avatars_connect_to_avatar_retrieved (priv->connection,
-                                                                        tp_contact_factory_avatar_retrieved_cb,
-                                                                        NULL, NULL,
-                                                                        tp_factory,
-                                                                        NULL);
-       tp_cli_connection_interface_capabilities_connect_to_capabilities_changed (priv->connection,
-                                                                                 tp_contact_factory_capabilities_changed_cb,
-                                                                                 NULL, NULL,
-                                                                                 tp_factory,
-                                                                                 NULL);
-
-
-       /* FIXME: This should be moved to TpConnection */
-       tp_cli_connection_interface_avatars_call_get_avatar_requirements (priv->connection,
-                                                                         -1,
-                                                                         tp_contact_factory_got_avatar_requirements_cb,
-                                                                         NULL, NULL,
-                                                                         tp_factory);
-       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));
-
-       return tp_factory;
-}
-
-static void
-empathy_tp_contact_factory_class_init (EmpathyTpContactFactoryClass *klass)
-{
-       GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-       object_class->finalize = tp_contact_factory_finalize;
-       object_class->constructor = tp_contact_factory_constructor;
-       object_class->get_property = tp_contact_factory_get_property;
-       object_class->set_property = tp_contact_factory_set_property;
-
-       g_object_class_install_property (object_class,
-                                        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_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));
-}
-
-static void
-empathy_tp_contact_factory_init (EmpathyTpContactFactory *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;
-}
-
-static GHashTable *factories = 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_dup_singleton (TpConnection *connection)
-{
-       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;
-}
-