diff pidgin/gtkblist.c @ 28600:650b79eaf305

merge of '453bf3da68c1baca3d6585b338ac13df415c9be0' and 'aedf94cca64dd46503c2482445e6de4e9816b7df'

--- a/pidgin/gtkblist.c	Sat Aug 15 05:52:26 2009 +0000
+++ b/pidgin/gtkblist.c	Sun Aug 16 05:29:25 2009 +0000
@@ -622,7 +622,14 @@
 				struct _pidgin_blist_node *gtknode =
 					(struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node);
 
-				if (purple_contact_get_alias(contact) || gtknode->contact_expanded) {
+				/*
+				 * XXX Using purple_contact_get_alias here breaks because we
+				 * specifically want to check the contact alias only (i.e. not
+				 * the priority buddy, which purple_contact_get_alias does).
+				 * Adding yet another get_alias is evil, so figure this out
+				 * later :-P
+				 */
+				if (contact->alias || gtknode->contact_expanded) {
 					purple_blist_alias_contact(contact, arg2);
 					gtk_blist_auto_personize(purple_blist_node_get_parent(node), arg2);
 				} else {