Mercurial > pidgin.yaz
diff src/conversation.c @ 8348:9f11f793c19e
[gaim-migrate @ 9072]
use the account alias before the buddy alias, if it exists
committer: Tailor Script <tailor@pidgin.im>
author | Nathan Walp <nwalp@pidgin.im> |
---|---|
date | Thu, 26 Feb 2004 17:54:40 +0000 |
parents | dde73afb3283 |
children | 7a58f6f9fc3e |
line wrap: on
line diff
--- a/src/conversation.c Thu Feb 26 17:40:37 2004 +0000 +++ b/src/conversation.c Thu Feb 26 17:54:40 2004 +0000 @@ -1419,10 +1419,10 @@ b = gaim_find_buddy(account, gaim_account_get_username(account)); - if (b != NULL && strcmp(b->name, gaim_get_buddy_alias(b))) + if (gaim_account_get_alias(account) != NULL) + who = account->alias; + else if (b != NULL && strcmp(b->name, gaim_get_buddy_alias(b))) who = gaim_get_buddy_alias(b); - else if (gaim_account_get_alias(account) != NULL) - who = account->alias; else if (gaim_connection_get_display_name(gc) != NULL) who = gaim_connection_get_display_name(gc); else