# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1108842369 0
# Node ID f0fd35985cb0d97506b59dd0fa75acefc90201f8
# Parent  41a18bf60ee15bd1b09fc64a0a1bff5f40aac17a
[gaim-migrate @ 12067]
This should fix using multiple switchboards for a single conversation, which
was happening when Gaim didn't initiate the conversation.

committer: Tailor Script <tailor@pidgin.im>

diff -r 41a18bf60ee1 -r f0fd35985cb0 src/protocols/msn/switchboard.c
--- a/src/protocols/msn/switchboard.c	Sat Feb 19 02:41:19 2005 +0000
+++ b/src/protocols/msn/switchboard.c	Sat Feb 19 19:46:09 2005 +0000
@@ -854,14 +854,20 @@
 		serv_got_chat_in(gc, swboard->chat_id, passport, 0, body_final,
 						 time(NULL));
 		if (swboard->conv == NULL)
+		{
 			swboard->conv = gaim_find_chat(gc, swboard->chat_id);
+			swboard->flag |= MSN_SB_FLAG_IM;
+		}
 	}
 	else
 	{
 		serv_got_im(gc, passport, body_final, 0, time(NULL));
 		if (swboard->conv == NULL)
+		{
 			swboard->conv = gaim_find_conversation_with_account(GAIM_CONV_IM,
 									passport, gaim_connection_get_account(gc));
+			swboard->flag |= MSN_SB_FLAG_IM;
+		}
 	}
 
 	g_free(body_final);