diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-02 20:50:00 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-09-02 20:50:00 +0800 |
| commit | 1446a4070254cb7cb02fa79dabf724e0429a7ca5 (patch) | |
| tree | ca21ec2251174a79712a6d6fb20009f56e9fc605 | |
| parent | 3ac7d8d0867872513543d71fe5fdb4a3825a560e (diff) | |
| parent | 007716dcb3720dc85aedbf01f33b787f66a2f8e6 (diff) | |
| download | gsoc2013-empathy-1446a4070254cb7cb02fa79dabf724e0429a7ca5.tar gsoc2013-empathy-1446a4070254cb7cb02fa79dabf724e0429a7ca5.tar.gz gsoc2013-empathy-1446a4070254cb7cb02fa79dabf724e0429a7ca5.tar.bz2 gsoc2013-empathy-1446a4070254cb7cb02fa79dabf724e0429a7ca5.tar.lz gsoc2013-empathy-1446a4070254cb7cb02fa79dabf724e0429a7ca5.tar.xz gsoc2013-empathy-1446a4070254cb7cb02fa79dabf724e0429a7ca5.tar.zst gsoc2013-empathy-1446a4070254cb7cb02fa79dabf724e0429a7ca5.zip | |
Merge remote branch 'kaserf/fix-account-name-update'
| -rw-r--r-- | libempathy-gtk/empathy-account-widget.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c index d3cf1f3e4..a5c3e8dc4 100644 --- a/libempathy-gtk/empathy-account-widget.c +++ b/libempathy-gtk/empathy-account-widget.c @@ -1809,7 +1809,8 @@ do_constructed (GObject *obj) display_name = empathy_account_settings_get_display_name (priv->settings); default_display_name = empathy_account_widget_get_default_display_name (self); - if (tp_strdiff (display_name, default_display_name)) + if (tp_strdiff (display_name, default_display_name) && + !priv->creating_account) { /* The display name of the account is not the one that we'd assign by * default; assume that the user changed it manually */ |