aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-03 16:48:23 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-03 16:48:23 +0800
commit46d00adb33b8b356e56f633d2ac25dfa06705bbe (patch)
treeda556457e2c519f2ceec9f7fb86aef0bf30c35a8
parent4a7553f1f6ab0f7675da83749ab91515450f9944 (diff)
downloadgsoc2013-empathy-46d00adb33b8b356e56f633d2ac25dfa06705bbe.tar
gsoc2013-empathy-46d00adb33b8b356e56f633d2ac25dfa06705bbe.tar.gz
gsoc2013-empathy-46d00adb33b8b356e56f633d2ac25dfa06705bbe.tar.bz2
gsoc2013-empathy-46d00adb33b8b356e56f633d2ac25dfa06705bbe.tar.lz
gsoc2013-empathy-46d00adb33b8b356e56f633d2ac25dfa06705bbe.tar.xz
gsoc2013-empathy-46d00adb33b8b356e56f633d2ac25dfa06705bbe.tar.zst
gsoc2013-empathy-46d00adb33b8b356e56f633d2ac25dfa06705bbe.zip
assistant: always uses empathy_account_widget_get_default_display_name to get a better display name
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)
-rw-r--r--src/empathy-account-assistant.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index 288a32d8f..8f280e698 100644
--- 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);
- 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;