assistant: call empathy_account_widget_get_default_display_name before actually creat...

This saves us a D-Bus call.

diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 8f280e698d59ea7a1bd32001424c995958538ea2..97b7f9692a37b459d215c922185b2dd52915a2d4 100644 (file)
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -324,19 +324,9 @@ account_assistant_apply_account_cb (GObject *source,
   EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
   EmpathyAccountSettings *settings = EMPATHY_ACCOUNT_SETTINGS (source);
   TpAccount *account;
-  gchar *display_name;
 
   empathy_account_settings_apply_finish (settings, result, &error);
 
-  /* 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);
-
-  g_free (display_name);
-
   priv->is_creating = FALSE;
 
   if (error != NULL)
@@ -358,12 +348,22 @@ account_assistant_apply_account_and_finish (EmpathyAccountAssistant *self,
     EmpathyAccountSettings *settings)
 {
   EmpathyAccountAssistantPriv *priv = GET_PRIV (self);
+  gchar *display_name;
 
   if (settings == NULL)
     return;
 
   priv->is_creating = TRUE;
 
+  /* 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);
+
+  g_free (display_name);
+
   empathy_account_settings_apply_async (settings,
       account_assistant_apply_account_cb, self);
 }