pidgin.2.5.6: 572ef25e: applied changes from 6572a403c4d94566224...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: 572ef25eacf298e7d3a90d1a57937529d1500039
Ancestor: 8e113b09c6e89692d18727469ed646bdaea504d1
Author: elb at pidgin.im
Date: 2009-04-28T20:49:36
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/572ef25eacf298e7d3a90d1a57937529d1500039

Modified files:
        ChangeLog libpurple/protocols/msn/soap.c

ChangeLog: 

applied changes from 6572a403c4d945662240548bd49dd8b8a47f6fc8
             through 881df138362222308d7b078687b7576861609e9c

ChangeLog for the above.

-------------- next part --------------
============================================================
--- ChangeLog	14f5e3e6181d5628153a082c4471b1468d14a478
+++ ChangeLog	cb289ceee6637006903e233c4658d828a66b0a9a
@@ -7,6 +7,9 @@ version 2.5.6 (??/??/2009):
 	* 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.
 
============================================================
--- libpurple/protocols/msn/soap.c	a6c9a90fd13661ea0885013a22674f89da8657db
+++ libpurple/protocols/msn/soap.c	c2484b6578c251aa8081f269eafd5f7198ae13f2
@@ -667,6 +667,7 @@ msn_soap_connection_run(gpointer data)
 			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)) {