From 37ae70ceec9ead69d1584067ed9a489f309d1961 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 3 Mar 2010 10:15:37 +0100 Subject: assistant: call empathy_account_widget_get_default_display_name before actually creating the account This saves us a D-Bus call. --- src/empathy-account-assistant.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c index 8f280e698..97b7f9692 100644 --- 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); } -- cgit v1.2.3