Mercurial > pidgin
changeset 17200:93fa59b2623e
merge of '0f88db079a278fed8edc76442c3b1f70db3b9ebc'
and 'a05b585fcb02299b9c93f1dd006f4929e3bf9ef0'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 23 May 2007 02:35:44 +0000 |
| parents | 204cbfeae945 (diff) 6d940df6c095 (current diff) |
| children | 9235189117c0 ffd85797ecab |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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! */