Mercurial > pidgin.yaz

comparison src/conversation.c @ 10667:51ea57c36056

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 12207] Todd Troxell removed IM aliases from chat rooms. Unfortunate, but necessary committer: Tailor Script <tailor@pidgin.im>
author Sean Egan <seanegan@gmail.com>
date Mon, 07 Mar 2005 19:09:45 +0000
parents 4829abdc5c35
children 4151d16f6348
comparison
equal deleted inserted replaced
10666:b39d5850883a 10667:51ea57c36056
1463 1463
1464 if (who == NULL) { 1464 if (who == NULL) {
1465 if (flags & GAIM_MESSAGE_SEND) { 1465 if (flags & GAIM_MESSAGE_SEND) {
1466 b = gaim_find_buddy(account, 1466 b = gaim_find_buddy(account,
1467 gaim_account_get_username(account)); 1467 gaim_account_get_username(account));
1468 1468 if (gaim_conversation_get_type(conv) != GAIM_CONV_CHAT) {
1469 if (gaim_account_get_alias(account) != NULL) 1469 if (gaim_account_get_alias(account) != NULL)
1470 who = account->alias; 1470 who = account->alias;
1471 else if (b != NULL && strcmp(b->name, gaim_buddy_get_contact_alias(b))) 1471 else if (b != NULL && strcmp(b->name, gaim_buddy_get_contact_alias(b)))
1472 who = gaim_buddy_get_contact_alias(b); 1472 who = gaim_buddy_get_contact_alias(b);
1473 else if (gaim_connection_get_display_name(gc) != NULL) 1473 else if (gaim_connection_get_display_name(gc) != NULL)
1474 who = gaim_connection_get_display_name(gc); 1474 who = gaim_connection_get_display_name(gc);
1475 }
1475 else 1476 else
1476 who = gaim_account_get_username(account); 1477 who = gaim_account_get_username(account);
1477 } 1478 }
1478 else { 1479 else {
1479 b = gaim_find_buddy(account, 1480 b = gaim_find_buddy(account,
1480 gaim_conversation_get_name(conv)); 1481 gaim_conversation_get_name(conv));
1481 1482
1482 if (b != NULL) 1483 if (b != NULL && gaim_conversation_get_type(conv) != GAIM_CONV_CHAT)
1483 who = gaim_buddy_get_contact_alias(b); 1484 who = gaim_buddy_get_contact_alias(b);
1484 else 1485 else
1485 who = gaim_conversation_get_name(conv); 1486 who = gaim_conversation_get_name(conv);
1486 } 1487 }
1487 } 1488 }
1488 else if ((who != NULL) && (*who != '\0')) { 1489 else if ((who != NULL) && (*who != '\0') && gaim_conversation_get_type(conv) != GAIM_CONV_CHAT) {
1489 b = gaim_find_buddy(account, who); 1490 b = gaim_find_buddy(account, who);
1490 1491
1491 if (b != NULL) 1492 if (b != NULL)
1492 who = gaim_buddy_get_contact_alias(b); 1493 who = gaim_buddy_get_contact_alias(b);
1493 } 1494 }