Mercurial > pidgin.yaz

comparison src/conversation.c @ 8348:9f11f793c19e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
comparison
equal deleted inserted replaced
8347:5d039bc19350 8348:9f11f793c19e
1417 if (who == NULL) { 1417 if (who == NULL) {
1418 if (flags & GAIM_MESSAGE_SEND) { 1418 if (flags & GAIM_MESSAGE_SEND) {
1419 b = gaim_find_buddy(account, 1419 b = gaim_find_buddy(account,
1420 gaim_account_get_username(account)); 1420 gaim_account_get_username(account));
1421 1421
1422 if (b != NULL && strcmp(b->name, gaim_get_buddy_alias(b))) 1422 if (gaim_account_get_alias(account) != NULL)
1423 who = account->alias;
1424 else if (b != NULL && strcmp(b->name, gaim_get_buddy_alias(b)))
1423 who = gaim_get_buddy_alias(b); 1425 who = gaim_get_buddy_alias(b);
1424 else if (gaim_account_get_alias(account) != NULL)
1425 who = account->alias;
1426 else if (gaim_connection_get_display_name(gc) != NULL) 1426 else if (gaim_connection_get_display_name(gc) != NULL)
1427 who = gaim_connection_get_display_name(gc); 1427 who = gaim_connection_get_display_name(gc);
1428 else 1428 else
1429 who = gaim_account_get_username(account); 1429 who = gaim_account_get_username(account);
1430 } 1430 }