Mercurial > pidgin.yaz
changeset 25855:96e54eb6100a
applied changes from 6572a403c4d945662240548bd49dd8b8a47f6fc8
through 881df138362222308d7b078687b7576861609e9c
ChangeLog for the above.
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Tue, 28 Apr 2009 20:49:36 +0000 |
| parents | e7f0570f01cf |
| children | 1b8c18ab762f |
| files | ChangeLog libpurple/protocols/msn/soap.c |
| diffstat | 2 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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)) {