# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1179883340 0
# Node ID 204cbfeae945546acb6aad0c5880206fae0851d3
# Parent  d63075ed73c94694d42ed4dd93c5dadab34617d3# Parent  05fa005bdc5911901b0d9d0444f246dec8fe4769
merge of '313e5f0e5697afe45ac3ac1160aa4de526089ba2'
     and 'ce9cdd5d43f18f094312c5c88c6b6406398f0f3b'

diff -r 05fa005bdc59 -r 204cbfeae945 libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Wed May 23 01:14:29 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Wed May 23 01:22:20 2007 +0000
@@ -1297,7 +1297,12 @@
 
 	conv = swboard->conv;
 
-	msn_switchboard_release(swboard, MSN_SB_FLAG_IM);
+	/* If we release the switchboard here, it may still have messages
+	   pending ACK which would result in incorrect unsent message errors.
+	   Just let it timeout... This is *so* going to screw with people who
+	   use dumb clients that report "User has closed the conversation window" */
+	/* msn_switchboard_release(swboard, MSN_SB_FLAG_IM); */
+	swboard->conv = NULL;
 
 	/* If other switchboards managed to associate themselves with this
 	 * conv, make sure they know it's gone! */