# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1110222585 0
# Node ID 51ea57c360566005c304f36f19e77d628eb4d71e
# Parent  b39d5850883af64e5b61e8d6c9cb3ec87c4b9043
[gaim-migrate @ 12207]
Todd Troxell removed IM aliases from chat rooms. Unfortunate, but necessary

committer: Tailor Script <tailor@pidgin.im>

diff -r b39d5850883a -r 51ea57c36056 COPYRIGHT
--- a/COPYRIGHT	Mon Mar 07 18:58:52 2005 +0000
+++ b/COPYRIGHT	Mon Mar 07 19:09:45 2005 +0000
@@ -191,6 +191,7 @@
 Stu Tomlinson
 Bill Tompkins
 Tom Tromey
+Todd Troxell
 Chris Toshok
 Brad Turcotte
 Junichi Uekawa
diff -r b39d5850883a -r 51ea57c36056 src/conversation.c
--- a/src/conversation.c	Mon Mar 07 18:58:52 2005 +0000
+++ b/src/conversation.c	Mon Mar 07 19:09:45 2005 +0000
@@ -1465,13 +1465,14 @@
 				if (flags & GAIM_MESSAGE_SEND) {
 					b = gaim_find_buddy(account,
 							    gaim_account_get_username(account));
-
-					if (gaim_account_get_alias(account) != NULL)
-						who = account->alias;
-					else if (b != NULL && strcmp(b->name, gaim_buddy_get_contact_alias(b)))
-						who = gaim_buddy_get_contact_alias(b);
-					else if (gaim_connection_get_display_name(gc) != NULL)
-						who = gaim_connection_get_display_name(gc);
+					if (gaim_conversation_get_type(conv) != GAIM_CONV_CHAT) {
+						if (gaim_account_get_alias(account) != NULL)
+							who = account->alias;
+						else if (b != NULL && strcmp(b->name, gaim_buddy_get_contact_alias(b)))
+							who = gaim_buddy_get_contact_alias(b);
+						else if (gaim_connection_get_display_name(gc) != NULL)
+							who = gaim_connection_get_display_name(gc);
+					}
 					else
 						who = gaim_account_get_username(account);
 				}
@@ -1479,13 +1480,13 @@
 					b = gaim_find_buddy(account,
 							    gaim_conversation_get_name(conv));
 
-					if (b != NULL)
+					if (b != NULL && gaim_conversation_get_type(conv) != GAIM_CONV_CHAT)
 						who = gaim_buddy_get_contact_alias(b);
 					else
 						who = gaim_conversation_get_name(conv);
 				}
 			}
-			else if ((who != NULL) && (*who != '\0')) {
+			else if ((who != NULL) && (*who != '\0') && gaim_conversation_get_type(conv) != GAIM_CONV_CHAT) {
 				b = gaim_find_buddy(account, who);
 
 				if (b != NULL)