# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1240951776 0
# Node ID 96e54eb6100ac56e5849c39784ed5b2ca38509a1
# Parent  e7f0570f01cf42f10850f38beec7be84d5286210
applied changes from 6572a403c4d945662240548bd49dd8b8a47f6fc8
             through 881df138362222308d7b078687b7576861609e9c

ChangeLog for the above.

diff -r e7f0570f01cf -r 96e54eb6100a ChangeLog
--- a/ChangeLog	Tue Apr 28 20:46:53 2009 +0000
+++ b/ChangeLog	Tue Apr 28 20:49:36 2009 +0000
@@ -7,6 +7,9 @@
 	* Notify the user if a /nick command fails, rather than trying
 	  fallback nicks.
 
+	MSN:
+	* Fix a race condition causing occasional Pidgin crashes.
+
 	Yahoo:
 	* Fix a crash when sending very long messages.
 
diff -r e7f0570f01cf -r 96e54eb6100a libpurple/protocols/msn/soap.c
--- a/libpurple/protocols/msn/soap.c	Tue Apr 28 20:46:53 2009 +0000
+++ b/libpurple/protocols/msn/soap.c	Tue Apr 28 20:49:36 2009 +0000
@@ -667,6 +667,7 @@
 			conn->handled_len = 0;
 			conn->current_request = req;
 
+			purple_input_remove(conn->event_handle);
 			conn->event_handle = purple_input_add(conn->ssl->fd,
 				PURPLE_INPUT_WRITE, msn_soap_write_cb, conn);
 			if (!msn_soap_write_cb_internal(conn, conn->ssl->fd, PURPLE_INPUT_WRITE, TRUE)) {