# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1057386718 0
# Node ID fb5d2ede88e7892dd614b7bbf1a31fdf6f0a8954
# Parent  d2d5d1984b0903f855c1f960ad1e31e8e134578b
[gaim-migrate @ 6472]
Your account never appears a million bajillion times in MSN chat windows.
Now it appears 0 times...... I'll fix that. Less evil though! Also, no more
infinite loops on buddy icon sends in a chat, since we don't really want to
do that, since it's wrong and we might get yelled at by our parents.

committer: Tailor Script <tailor@pidgin.im>

diff -r d2d5d1984b09 -r fb5d2ede88e7 src/protocols/msn/switchboard.c
--- a/src/protocols/msn/switchboard.c	Sat Jul 05 06:06:56 2003 +0000
+++ b/src/protocols/msn/switchboard.c	Sat Jul 05 06:31:58 2003 +0000
@@ -166,10 +166,6 @@
 		gaim_chat_add_user(GAIM_CHAT(swboard->chat), params[3], NULL);
 	}
 
-	if (swboard->chat != NULL)
-		gaim_chat_add_user(GAIM_CHAT(swboard->chat),
-						   gaim_account_get_username(account), NULL);
-
 	return TRUE;
 }
 
@@ -189,8 +185,6 @@
 											 "MSN Chat");
 		gaim_chat_add_user(GAIM_CHAT(swboard->chat),
 						   msn_user_get_passport(swboard->user), NULL);
-		gaim_chat_add_user(GAIM_CHAT(swboard->chat),
-						   gaim_account_get_username(account), NULL);
 
 		msn_user_unref(swboard->user);
 	}
@@ -348,8 +342,10 @@
 
 	clientcaps = msn_message_get_hashtable_from_body(msg);
 
-	if ((value = g_hash_table_lookup(clientcaps, "Buddy-Icons")) != NULL)
-		msn_buddy_icon_invite(swboard);
+	if (swboard->chat == NULL) {
+		if ((value = g_hash_table_lookup(clientcaps, "Buddy-Icons")) != NULL)
+			msn_buddy_icon_invite(swboard);
+	}
 
 	return TRUE;
 }