diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-11-03 23:15:08 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-11-03 23:16:14 +0800 |
| commit | 2fdf42815677e4e7f41a73f77997af87d5ae5eb2 (patch) | |
| tree | 0b6c8ccc18e7fc7f796245e2b3442a8a7c88329b /src | |
| parent | f66a2306e3b29591cc4fce485afbc12f3221e459 (diff) | |
| download | gsoc2013-empathy-2fdf42815677e4e7f41a73f77997af87d5ae5eb2.tar gsoc2013-empathy-2fdf42815677e4e7f41a73f77997af87d5ae5eb2.tar.gz gsoc2013-empathy-2fdf42815677e4e7f41a73f77997af87d5ae5eb2.tar.bz2 gsoc2013-empathy-2fdf42815677e4e7f41a73f77997af87d5ae5eb2.tar.lz gsoc2013-empathy-2fdf42815677e4e7f41a73f77997af87d5ae5eb2.tar.xz gsoc2013-empathy-2fdf42815677e4e7f41a73f77997af87d5ae5eb2.tar.zst gsoc2013-empathy-2fdf42815677e4e7f41a73f77997af87d5ae5eb2.zip | |
get_default_display_name: use the real protocol name to check if it's IRC or not
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-accounts-dialog.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/empathy-accounts-dialog.c b/src/empathy-accounts-dialog.c index f12c4513a..7092e55c5 100644 --- a/src/empathy-accounts-dialog.c +++ b/src/empathy-accounts-dialog.c @@ -218,9 +218,6 @@ get_default_display_name (EmpathyAccountSettings *settings) login_id = empathy_account_settings_get_string (settings, "account"); protocol = empathy_account_settings_get_protocol (settings); - if ((p = empathy_protocol_name_to_display_name (protocol)) != NULL) - protocol = p; - if (login_id != NULL) { if (!tp_strdiff (protocol, "irc")) @@ -240,8 +237,14 @@ get_default_display_name (EmpathyAccountSettings *settings) { default_display_name = g_strdup (login_id); } + + return default_display_name; } - else if (protocol != NULL) + + if ((p = empathy_protocol_name_to_display_name (protocol)) != NULL) + protocol = p; + + if (protocol != NULL) { /* To translators: The parameter is the protocol name. The resulting * string will be something like: "Jabber Account" */ |