diff src/conversation.c @ 4227:a614423c648f

[gaim-migrate @ 4471] This is a patch from Nathan Walp that adds a "char server_alias[BUDDY_ALIAS_MAXLEN]" to struct buddy, and a preference option to show the server alias instead of the alias set by you. It shouldn't cause any problems. But then again, faceprint is a crazy patch writer, with an emphasis on crazy, if you know what I mean. Huh? Get it? "Crazy"? I kill me. But right after I kill Time Warner. committer: Tailor Script <[e-mail]>

--- a/src/conversation.c	Tue Jan 07 16:18:08 2003 +0000
+++ b/src/conversation.c	Tue Jan 07 17:44:34 2003 +0000
@@ -1740,8 +1740,8 @@
 		if (!who) {
 			if (flags & WFLAG_SEND) {
 				b = find_buddy(c->gc, c->gc->username);
-				if (b && strcmp(b->name, b->show))
-					 who = b->show;
+				if (get_buddy_alias(b))
+					 who = get_buddy_alias(b);
 				else if (c->gc->user->alias[0])
 					who = c->gc->user->alias;
 				else if (c->gc->displayname[0])
@@ -1751,14 +1751,14 @@
 			} else {
 				b = find_buddy(c->gc, c->name);
 				if (b)
-					who = b->show;
+					who = get_buddy_alias(b);
 				else
 					who = c->name;
 			}
 		} else {
 			b = find_buddy(c->gc, who);
 			if (b)
-				who = b->show;
+				who = get_buddy_alias(b);
 		}
 	}
 
@@ -3218,7 +3218,7 @@
 	GtkNotebook *nb;
 
 	if ((im_options & OPT_IM_ALIAS_TAB) && c->gc && ((b = find_buddy(c->gc, c->name)) != NULL))
-		text = b->show;
+		text = get_buddy_alias(b);
 	else
 		text = c->name;