Mercurial > pidgin
changeset 17199:204cbfeae945
merge of '313e5f0e5697afe45ac3ac1160aa4de526089ba2'
and 'ce9cdd5d43f18f094312c5c88c6b6406398f0f3b'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Wed, 23 May 2007 01:22:20 +0000 |
| parents | d63075ed73c9 (diff) 05fa005bdc59 (current diff) |
| children | 93fa59b2623e |
| files | |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Wed May 23 01:14:29 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Wed May 23 01:22:20 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! */