Merge branch 'sjoerd-mc5' into mc5

Conflicts:
	libempathy-gtk/empathy-account-widget.c
	libempathy-gtk/empathy-protocol-chooser.c

diff --cc libempathy-gtk/Makefile.am
Simple merge

diff --cc libempathy-gtk/empathy-account-widget-irc.c
index 425adbcb56b0a07b09e565dd52427947204be5c6,c04f3463da89f01f0a16c2560993d50646d5014f..932e2f81dcf7f8394ae52fb98da309013de38bf7
--- 1/libempathy-gtk/empathy-account-widget-irc.c
--- 2/libempathy-gtk/empathy-account-widget-irc.c
+++ b/libempathy-gtk/empathy-account-widget-irc.c
@@@ -422,13 -422,16 +422,13 @@@ empathy_account_widget_irc_build (Empat
  {
    EmpathyAccountWidgetIrc *settings;
    gchar *dir, *user_file_with_path, *global_file_with_path;
 -  GtkBuilder *gui;
 -  GtkWidget *widget;
    GtkListStore *store;
    GtkCellRenderer *renderer;
 -  gchar *filename;
  
    settings = g_slice_new0 (EmpathyAccountWidgetIrc);
 -  settings->settings = g_object_ref (account_settings);
 +  settings->self = self;
  
-   dir = g_build_filename (g_get_home_dir (), ".gnome2", PACKAGE_NAME, NULL);
+   dir = g_build_filename (g_get_user_config_dir (), PACKAGE_NAME, NULL);
    g_mkdir_with_parents (dir, S_IRUSR | S_IWUSR | S_IXUSR);
    user_file_with_path = g_build_filename (dir, IRC_NETWORKS_FILENAME, NULL);
    g_free (dir);

diff --cc libempathy-gtk/empathy-contact-dialogs.c
index 4252ae0199234c22d0230ca7591380110ba474d3,fc1cbbc8ea1c83350a7cb67b3f3b7de7cca00a52..725011c0b338cda8a881306f4fc005bd8483068c
--- 1/libempathy-gtk/empathy-contact-dialogs.c
--- 2/libempathy-gtk/empathy-contact-dialogs.c
+++ b/libempathy-gtk/empathy-contact-dialogs.c
@@@ -334,13 -334,11 +334,15 @@@ can_add_contact_to_account (EmpathyAcco
        gboolean               result;
  
        connection = empathy_account_get_connection (account);
+       if (connection == NULL)
+               return FALSE;
  
 +      if (connection == NULL) {
 +              return FALSE;
 +      }
 +
        contact_manager = empathy_contact_manager_dup_singleton ();
-       result = empathy_contact_manager_can_add (contact_manager, connection);
+       result = empathy_contact_manager_get_flags_for_connection (contact_manager, connection) & EMPATHY_CONTACT_LIST_CAN_ADD;
        g_object_unref (contact_manager);
  
        return result;

diff --cc libempathy-gtk/empathy-protocol-chooser.c
index 79adbac9fbceadef437d5864b81a50f866a24dbc,65f778ac445977b494a0e5558d57a6325427a73f..ecd26d8ff60eda766a866ef51783da0f8e75f2ee
--- 1/libempathy-gtk/empathy-protocol-chooser.c
--- 2/libempathy-gtk/empathy-protocol-chooser.c
+++ b/libempathy-gtk/empathy-protocol-chooser.c
@@@ -164,19 -132,14 +164,19 @@@ protocol_choosers_add_cm (EmpathyProtoc
      {
        const TpConnectionManagerProtocol *proto = *iter;
        gchar *icon_name;
 -      gchar *display_name;
 +      const gchar *display_name;
 +      gchar *display_name_set;
  
-       icon_name = g_strdup_printf ("im-%s", proto->name);
+       icon_name = empathy_protocol_icon_name (proto->name);
 +      display_name = protocol_chooser_proto_name_to_display_name (proto->name);
 +
 +      if (display_name == NULL)
 +        display_name = proto->name;
  
        if (!tp_strdiff (cm->name, "haze"))
 -        display_name = g_strdup_printf ("%s (Haze)", proto->name);
 +        display_name_set = g_strdup_printf ("%s (Haze)", display_name);
        else
 -        display_name = g_strdup (proto->name);
 +        display_name_set = g_strdup (display_name);
  
        gtk_list_store_insert_with_values (priv->store, NULL, 0,
            COL_ICON, icon_name,

diff --cc libempathy/empathy-account-manager.c
index b037f5d30b44ad0d66f6b866e3b76120f25ca4d2,727eb7eaf50b1795556709189820f133d49a5a4d..18eff355ff49287f0ada6590a94dba0e97378164
--- 1/libempathy/empathy-account-manager.c
--- 2/libempathy/empathy-account-manager.c
+++ b/libempathy/empathy-account-manager.c
@@@ -914,17 -847,17 +912,20 @@@ empathy_account_manager_created_cb (TpA
  
  void
  empathy_account_manager_create_account_async (EmpathyAccountManager *manager,
-   const gchar *connection_manager,
-   const gchar *protocol, const gchar *display_name,
-   GHashTable *parameters, GHashTable *properties,
-   GAsyncReadyCallback callback, gpointer user_data)
+     const gchar *connection_manager,
+     const gchar *protocol,
+     const gchar *display_name,
+     GHashTable *parameters,
+     GHashTable *properties,
+     GAsyncReadyCallback callback,
+     gpointer user_data)
  {
    EmpathyAccountManagerPriv *priv = GET_PRIV (manager);
 -  GSimpleAsyncResult *result = g_simple_async_result_new (G_OBJECT (manager),
 -      callback, user_data, empathy_account_manager_create_account_finish);
 +  GSimpleAsyncResult *res;
 +
 +  res = g_simple_async_result_new
 +    (G_OBJECT (manager), callback, user_data,
 +     empathy_account_manager_create_account_finish);
  
    tp_cli_account_manager_call_create_account (priv->tp_manager,
        -1,

diff --cc libempathy/empathy-account-settings.c
Simple merge

diff --cc libempathy/empathy-account.c
Simple merge

diff --cc po/POTFILES.in
Simple merge