assistant: always uses empathy_account_widget_get_default_display_name to get a bette...

EmpathyAccountSettings is created with a default display name such as "New
Jabber account". But once the account has been created we want to update it to
a more relevant name. (#611675)

diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 288a32d8f643da4aade051ab930127e64c54885f..8f280e698d59ea7a1bd32001424c995958538ea2 100644 (file)
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -328,17 +328,14 @@ account_assistant_apply_account_cb (GObject *source,
 
   empathy_account_settings_apply_finish (settings, result, &error);
 
 
   empathy_account_settings_apply_finish (settings, result, &error);
 

-  if (empathy_account_settings_get_display_name (settings) == NULL)
-    {
-      /* set default display name */
-      display_name = empathy_account_widget_get_default_display_name (
-          priv->current_widget_object);
+  /* set default display name */
+  display_name = empathy_account_widget_get_default_display_name (
+      priv->current_widget_object);

 
 

-      empathy_account_settings_set_display_name_async (settings,
-          display_name, NULL, NULL);
+  empathy_account_settings_set_display_name_async (settings,
+      display_name, NULL, NULL);

 
 

-      g_free (display_name);
-    }
+  g_free (display_name);

 
   priv->is_creating = FALSE;
 
 
   priv->is_creating = FALSE;