diff pidgin/gtkblist.c @ 19234:aafa9b36344e

Double-click infopane to alias or change topic. Also, show alias instead of screenname in infopane
author Sean Egan <seanegan@gmail.com>
date Tue, 14 Aug 2007 00:31:24 +0000
parents d2c5d41ed7e1
children ce892eddb8f1 0d31b54d885a 0ed8a2a86a1b
line wrap: on
line diff
--- a/pidgin/gtkblist.c	Mon Aug 13 06:24:47 2007 +0000
+++ b/pidgin/gtkblist.c	Tue Aug 14 00:31:24 2007 +0000
@@ -3324,18 +3324,14 @@
 	}
 
 	/* XXX Good luck cleaning up this crap */
-	if (aliased) {
-		contact = (PurpleContact*)((PurpleBlistNode*)b)->parent;
-		if(contact)
-			gtkcontactnode = ((PurpleBlistNode*)contact)->ui_data;
-
-		if(gtkcontactnode && !gtkcontactnode->contact_expanded && contact->alias)
-			name = contact->alias;
-		else
-			name = purple_buddy_get_alias(b);
-	} else {
-		name = b->name;
-	}
+	contact = (PurpleContact*)((PurpleBlistNode*)b)->parent;
+	if(contact)
+		gtkcontactnode = ((PurpleBlistNode*)contact)->ui_data;
+
+	if(gtkcontactnode && !gtkcontactnode->contact_expanded && contact->alias)
+		name = contact->alias;
+	else
+		name = purple_buddy_get_alias(b);
 	
 	esc = g_markup_escape_text(name, strlen(name));