aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-20 23:54:24 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-01-25 22:13:39 +0800
commite18077ddd872c65bcca5f755fce4abceb0eebfab (patch)
tree9e88064a758c0dbae4a6693c2e41be8223d62995
parenta33e906abb007ae8f56377140c74db11dc1742ad (diff)
downloadgsoc2013-empathy-e18077ddd872c65bcca5f755fce4abceb0eebfab.tar
gsoc2013-empathy-e18077ddd872c65bcca5f755fce4abceb0eebfab.tar.gz
gsoc2013-empathy-e18077ddd872c65bcca5f755fce4abceb0eebfab.tar.bz2
gsoc2013-empathy-e18077ddd872c65bcca5f755fce4abceb0eebfab.tar.lz
gsoc2013-empathy-e18077ddd872c65bcca5f755fce4abceb0eebfab.tar.xz
gsoc2013-empathy-e18077ddd872c65bcca5f755fce4abceb0eebfab.tar.zst
gsoc2013-empathy-e18077ddd872c65bcca5f755fce4abceb0eebfab.zip
don't set display name if there is already one defined
Display name is already set for the salut account.
-rw-r--r--src/empathy-account-assistant.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c
index b52acfe1c..3e565512f 100644
--- a/src/empathy-account-assistant.c
+++ b/src/empathy-account-assistant.c
@@ -265,14 +265,17 @@ account_assistant_apply_account_cb (GObject *source,
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);
+ 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);
- 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;