diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-03-05 00:56:36 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2010-03-05 00:56:36 +0800 |
| commit | 6cbff108ac6211bfdc3638f23f3226f6521449fc (patch) | |
| tree | 1c2f593f18f813cded3192a71cb96b4b107e1d64 /src/empathy-account-assistant.c | |
| parent | 82d23975943d3d1087c4c23ce88c78ae0dc468a0 (diff) | |
| parent | b4d06351f186346bfc65204aa4057641bbde4649 (diff) | |
| download | gsoc2013-empathy-6cbff108ac6211bfdc3638f23f3226f6521449fc.tar gsoc2013-empathy-6cbff108ac6211bfdc3638f23f3226f6521449fc.tar.gz gsoc2013-empathy-6cbff108ac6211bfdc3638f23f3226f6521449fc.tar.bz2 gsoc2013-empathy-6cbff108ac6211bfdc3638f23f3226f6521449fc.tar.lz gsoc2013-empathy-6cbff108ac6211bfdc3638f23f3226f6521449fc.tar.xz gsoc2013-empathy-6cbff108ac6211bfdc3638f23f3226f6521449fc.tar.zst gsoc2013-empathy-6cbff108ac6211bfdc3638f23f3226f6521449fc.zip | |
Merge branch 'tweaks'
Diffstat (limited to 'src/empathy-account-assistant.c')
| -rw-r--r-- | src/empathy-account-assistant.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/empathy-account-assistant.c b/src/empathy-account-assistant.c index 97b7f9692..c944ccc98 100644 --- a/src/empathy-account-assistant.c +++ b/src/empathy-account-assistant.c @@ -348,21 +348,26 @@ 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); + /* set default display name, if there is no current widget then assume the + * display name was already set correctly. e.g. salut account creation */ + if (priv->current_widget_object != NULL) + { + gchar *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); + } empathy_account_settings_apply_async (settings, account_assistant_apply_account_cb, self); |