diff options
| author | Stu Tomlinson <nosnilmot@pidgin.im> | 2007-05-23 01:22:20 +0000 |
|---|---|---|
| committer | Stu Tomlinson <nosnilmot@pidgin.im> | 2007-05-23 01:22:20 +0000 |
| commit | 6163f67d5771d5d441e029409868b30fc9707afe (patch) | |
| tree | 2c19e8e5b5f6bc6fb449b0c0e9abe1ffcd579d73 | |
| parent | eb7c61e58c2482560692550d653779a76c35afac (diff) | |
| parent | ee3b4453ba6e3567dd3b0856571aca0eba7eedcd (diff) | |
| download | pidgin-6163f67d5771d5d441e029409868b30fc9707afe.tar.gz | |
merge of '8807cc2337f413d399ff0c4c7888e7b1d39c6ab7'
and 'ffda972c2fb425c9e7a591f87dc43d278814795f'
| -rw-r--r-- | libpurple/protocols/msn/msn.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c index ebd99b0e0c..f882d24c0c 100644 --- a/libpurple/protocols/msn/msn.c +++ b/libpurple/protocols/msn/msn.c @@ -1297,7 +1297,12 @@ msn_convo_closed(PurpleConnection *gc, const char *who) 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! */ |