Commit 37ae70ce authored by Guillaume Desmottes's avatar Guillaume Desmottes

assistant: call empathy_account_widget_get_default_display_name before...

assistant: call empathy_account_widget_get_default_display_name before actually creating the account

This saves us a D-Bus call.
parent 46d00adb
......@@ -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);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment