[Gaim-commits] CVS: gaim/src/protocols/msn switchboard.c,1.76.2.19,1.76.2.20

[Stu T. <nos...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8082

Modified Files:
      Tag: oldstatus
	switchboard.c 
Log Message:
This should fix using multiple switchboards for a single conversation, which
was happening when Gaim didn't initiate the conversation.



Index: switchboard.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/switchboard.c,v
retrieving revision 1.76.2.19
retrieving revision 1.76.2.20
diff -u -d -p -r1.76.2.19 -r1.76.2.20
--- switchboard.c	3 Feb 2005 19:47:25 -0000	1.76.2.19
+++ switchboard.c	19 Feb 2005 19:45:53 -0000	1.76.2.20
@@ -867,14 +867,20 @@ plain_msg(MsnCmdProc *cmdproc, MsnMessag
 		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(passport,
 											gaim_connection_get_account(gc));
+			swboard->flag |= MSN_SB_FLAG_IM;
+		}
 	}
 
 	g_free(body_final);