# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1124077811 0
# Node ID 74b003b1ba8d64d4b5602d0284c2cc0ab30cd33a
# Parent  14a166f01a8e76d485f07f1916d394ec380662ac
[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>

diff -r 14a166f01a8e -r 74b003b1ba8d src/blist.c
--- a/src/blist.c	Mon Aug 15 03:23:55 2005 +0000
+++ b/src/blist.c	Mon Aug 15 03:50:11 2005 +0000
@@ -1929,6 +1929,8 @@
 
 const char *gaim_buddy_get_alias(GaimBuddy *buddy)
 {
+	GaimContact *c;
+
 	g_return_val_if_fail(buddy != NULL, NULL);
 
 	/* Search for an alias for the buddy. In order of precedence: */
@@ -1940,6 +1942,11 @@
 	if ((buddy->server_alias) && (*buddy->server_alias))
 		return buddy->server_alias;
 
+	/* The contact alias */
+	c = gaim_buddy_get_contact(buddy);
+	if ((c != NULL) && (c->alias != NULL))
+		return c->alias;
+
 	/* The buddy's user name (i.e. no alias) */
 	return buddy->name;
 }
diff -r 14a166f01a8e -r 74b003b1ba8d src/conversation.c
--- 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;