# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1179887744 0
# Node ID 93fa59b2623ed2bf711ba4bfefb0d5b51d9808e7
# Parent  204cbfeae945546acb6aad0c5880206fae0851d3# Parent  6d940df6c09503d4a3e0ff6db21c8252759e7458
merge of '0f88db079a278fed8edc76442c3b1f70db3b9ebc'
     and 'a05b585fcb02299b9c93f1dd006f4929e3bf9ef0'

diff -r 6d940df6c095 -r 93fa59b2623e libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Wed May 23 02:31:55 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Wed May 23 02:35:44 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! */