Mercurial > pidgin

diff src/conversation.c @ 11264:74b003b1ba8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 13445] Show server aliases in conversation tabs again. Also changed gaim_buddy_get_alias to return the contact alias, if set. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 15 Aug 2005 03:50:11 +0000
parents bb0d7b719af2
children ef9280fdc511
line wrap: on
line diff
--- a/src/conversation.c	Mon Aug 15 03:23:55 2005 +0000
+++ b/src/conversation.c	Mon Aug 15 03:50:11 2005 +0000
@@ -1070,7 +1070,7 @@
 
 	if(gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
 		if(account && ((b = gaim_find_buddy(account, name)) != NULL))
-			text = gaim_buddy_get_local_alias(b);
+			text = gaim_buddy_get_alias(b);
 	} else if(gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
 		if(account && ((chat = gaim_blist_find_chat(account, name)) != NULL))
 			text = chat->alias;