# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1077818080 0
# Node ID 9f11f793c19edd7c9bae2d13f8c4e9f23c5792c4
# Parent  5d039bc193502f57102aef088f62f59e6d6b0073
[gaim-migrate @ 9072]
use the account alias before the buddy alias, if it exists

committer: Tailor Script <tailor@pidgin.im>

diff -r 5d039bc19350 -r 9f11f793c19e src/conversation.c
--- a/src/conversation.c	Thu Feb 26 17:40:37 2004 +0000
+++ b/src/conversation.c	Thu Feb 26 17:54:40 2004 +0000
@@ -1419,10 +1419,10 @@
 					b = gaim_find_buddy(account,
 							    gaim_account_get_username(account));
 
-					if (b != NULL && strcmp(b->name, gaim_get_buddy_alias(b)))
+					if (gaim_account_get_alias(account) != NULL)
+						who = account->alias;
+					else if (b != NULL && strcmp(b->name, gaim_get_buddy_alias(b)))
 						who = gaim_get_buddy_alias(b);
-					else if (gaim_account_get_alias(account) != NULL)
-						who = account->alias;
 					else if (gaim_connection_get_display_name(gc) != NULL)
 						who = gaim_connection_get_display_name(gc);
 					else