Merge branch 'master' into call1

diff --combined configure.ac
index efc7583b6a940776d209f2fb670eb3b64f0e8887,ecb2dad161822e19514203bca21245a79046f7c4..9392378006f548ffabb797b21e4c106258d509ce
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -3,7 -3,7 +3,7 @@@ m4_define(empathy_released, 0
  
  m4_define([empathy_major_version], [3])
  m4_define([empathy_minor_version], [3])
- m4_define([empathy_micro_version], [3])
+ m4_define([empathy_micro_version], [4])
  m4_define([empathy_nano_version], [0])
  
  dnl Display the nano_version only if it's not '0'
@@@ -71,6 -71,15 +71,6 @@@ CHAMPLAIN_REQUIRED=0.12.
  # those warnings later during the cycle (bgo #662662)
  AC_DEFINE(GLIB_DISABLE_DEPRECATION_WARNINGS, 1, [Build with GLib deprecated])
  
 -# telepathy-yell
 -prev_top_build_prefix=$ac_top_build_prefix
 -prev_ac_configure_args=$ac_configure_args
 -ac_configure_args="$ac_configure_args --disable-shared-library"
 -AX_CONFIG_DIR([telepathy-yell])
 -ac_top_build_prefix=$prev_top_build_prefix
 -ac_configure_args=$prev_ac_configure_args
 -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-yell/telepathy-yell
 -
  AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_HEADERS([config.h])
  AC_CONFIG_SRCDIR([configure.ac])
@@@ -195,6 -204,8 +195,6 @@@ PKG_CHECK_MODULES(EMPATHY
     libsoup-2.4
  ])
  
 -PKG_CHECK_MODULES(YELL, [telepathy-yell])
 -
  PKG_CHECK_MODULES(EMPATHY_AV,
  [
     farsight2-0.10
@@@ -214,8 -225,8 +214,8 @@@ AC_ARG_ENABLE(call
  if test "x$enable_call" != "xno" ; then
     PKG_CHECK_MODULES(EMPATHY_CALL,
     [
 -      farsight2-0.10
 -      telepathy-farstream >= 0.1.2
 +      farstream-0.1
 +      telepathy-farstream >= 0.2.0
        clutter-1.0 >= $CLUTTER_REQUIRED
        clutter-gtk-1.0
        clutter-gst-1.0

diff --combined libempathy/empathy-client-factory.c
index 65c0d267a3f01cabfdc6320fc5f015f7f0f5d9b7,294eaf5ff43cc41b7144c014e927c01dc1213fbd..2a85594410daeae3c557fceda61484c3e4410193
--- 1/libempathy/empathy-client-factory.c
--- 2/libempathy/empathy-client-factory.c
+++ b/libempathy/empathy-client-factory.c
@@@ -26,12 -26,42 +26,12 @@@
  #include "empathy-tp-chat.h"
  #include "empathy-utils.h"
  
 -#include <telepathy-yell/telepathy-yell.h>
 -
  G_DEFINE_TYPE (EmpathyClientFactory, empathy_client_factory,
      TP_TYPE_AUTOMATIC_CLIENT_FACTORY)
  
  #define chainup ((TpSimpleClientFactoryClass *) \
      empathy_client_factory_parent_class)
  
 -/* FIXME: move to yell */
 -static TpyCallChannel *
 -call_channel_new_with_factory (TpSimpleClientFactory *factory,
 -    TpConnection *conn,
 -    const gchar *object_path,
 -    const GHashTable *immutable_properties,
 -    GError **error)
 -{
 -  TpProxy *conn_proxy = (TpProxy *) conn;
 -
 -  g_return_val_if_fail (TP_IS_CONNECTION (conn), NULL);
 -  g_return_val_if_fail (object_path != NULL, NULL);
 -  g_return_val_if_fail (immutable_properties != NULL, NULL);
 -
 -  if (!tp_dbus_check_valid_object_path (object_path, error))
 -    return NULL;
 -
 -  return g_object_new (TPY_TYPE_CALL_CHANNEL,
 -      "factory", factory,
 -      "connection", conn,
 -      "dbus-daemon", conn_proxy->dbus_daemon,
 -      "bus-name", conn_proxy->bus_name,
 -      "object-path", object_path,
 -      "handle-type", (guint) TP_UNKNOWN_HANDLE_TYPE,
 -      "channel-properties", immutable_properties,
 -      NULL);
 -}
 -
  static TpChannel *
  empathy_client_factory_create_channel (TpSimpleClientFactory *factory,
      TpConnection *conn,
@@@ -53,6 -83,11 +53,6 @@@
              TP_SIMPLE_CLIENT_FACTORY (factory), account, conn, path,
              properties));
      }
 -  else if (!tp_strdiff (chan_type, TPY_IFACE_CHANNEL_TYPE_CALL))
 -    {
 -      return TP_CHANNEL (call_channel_new_with_factory (
 -            TP_SIMPLE_CLIENT_FACTORY (factory), conn, path, properties, error));
 -    }
  
    return chainup->create_channel (factory, conn, path, properties, error);
  }
@@@ -134,15 -169,21 +134,21 @@@ empathy_client_factory_dup_contact_feat
          TpConnection *connection)
  {
    GArray *features;
-   TpContactFeature feature;
+   TpContactFeature extra_features[] = {
+       TP_CONTACT_FEATURE_ALIAS,
+       TP_CONTACT_FEATURE_PRESENCE,
+       TP_CONTACT_FEATURE_AVATAR_TOKEN,
+       TP_CONTACT_FEATURE_AVATAR_DATA,
+       TP_CONTACT_FEATURE_CAPABILITIES,
+       /* Needed by empathy_individual_add_menu_item_new to check if a contact
+        * is already in the contact list. This feature is pretty cheap to
+        * prepare as it doesn't prepare the full roster. */
+       TP_CONTACT_FEATURE_SUBSCRIPTION_STATES,
+   };
  
    features = chainup->dup_contact_features (factory, connection);
  
-   /* Needed by empathy_individual_add_menu_item_new to check if a contact is
-    * already in the contact list. This feature is pretty cheap to prepare as
-    * it doesn't prepare the full roster. */
-   feature = TP_CONTACT_FEATURE_SUBSCRIPTION_STATES;
-   g_array_append_val (features, feature);
+   g_array_append_vals (features, extra_features, G_N_ELEMENTS (extra_features));
  
    return features;
  }