comparison src/conversation.c @ 12313:f9629b994b27

[gaim-migrate @ 14617] this was annoying the crap out of me. I can't think of any reason why not to honor a contact alias as the conversation title, so now we do committer: Tailor Script <tailor@pidgin.im>
author Christopher O'Brien <siege@pidgin.im>
date Sun, 04 Dec 2005 17:24:59 +0000
parents 4d3119205a33
children b1717befbb26
comparison
equal deleted inserted replaced
12312:1c8ea8f3b84e 12313:f9629b994b27
648 account = gaim_conversation_get_account(conv); 648 account = gaim_conversation_get_account(conv);
649 name = gaim_conversation_get_name(conv); 649 name = gaim_conversation_get_name(conv);
650 650
651 if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) { 651 if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
652 if(account && ((b = gaim_find_buddy(account, name)) != NULL)) 652 if(account && ((b = gaim_find_buddy(account, name)) != NULL))
653 text = gaim_buddy_get_alias(b); 653 text = gaim_buddy_get_contact_alias(b);
654 } else if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) { 654 } else if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
655 if(account && ((chat = gaim_blist_find_chat(account, name)) != NULL)) 655 if(account && ((chat = gaim_blist_find_chat(account, name)) != NULL))
656 text = chat->alias; 656 text = chat->alias;
657 } 657 }
658 658