# HG changeset patch
# User Christopher O'Brien <siege@pidgin.im>
# Date 1133717099 0
# Node ID f9629b994b271e0bf9b76a9681a150adcf478ef4
# Parent  1c8ea8f3b84e88976b308726b5ed6398dccb1382
[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>

diff -r 1c8ea8f3b84e -r f9629b994b27 src/conversation.c
--- a/src/conversation.c	Sun Dec 04 05:04:39 2005 +0000
+++ b/src/conversation.c	Sun Dec 04 17:24:59 2005 +0000
@@ -650,7 +650,7 @@
 
 	if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_IM) {
 		if(account && ((b = gaim_find_buddy(account, name)) != NULL))
-			text = gaim_buddy_get_alias(b);
+			text = gaim_buddy_get_contact_alias(b);
 	} else if(gaim_conversation_get_type(conv) == GAIM_CONV_TYPE_CHAT) {
 		if(account && ((chat = gaim_blist_find_chat(account, name)) != NULL))
 			text = chat->alias;