Mercurial > pidgin
diff src/protocols/msn/switchboard.c @ 10451:92d4a25fd33c
[gaim-migrate @ 11717]
This is patch 1090620 from Felipe Contreras to improve the handling of the
Individuals group on MSN and better buddy updates (modified by me to work in
HEAD)
Also included is my fix for bug 1090087 "MSN Groupchat Double Invite Crash",
a few spelling corrections, and make some more strings translatable.
committer: Tailor Script <tailor@pidgin.im>
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Thu, 30 Dec 2004 15:55:19 +0000 |
| parents | 6be6da69d603 |
| children | 9bed28273ec7 |
line wrap: on
line diff
--- a/src/protocols/msn/switchboard.c Thu Dec 30 06:26:53 2004 +0000 +++ b/src/protocols/msn/switchboard.c Thu Dec 30 15:55:19 2004 +0000 @@ -306,6 +306,8 @@ static void swboard_error_helper(MsnSwitchBoard *swboard, int reason, const char *passport) { + g_return_if_fail(swboard != NULL); + gaim_debug_info("msg", "Error: Unable to call the user %s\n", passport); if (swboard->total_users == 0) @@ -365,7 +367,7 @@ if (error == MSN_MSG_ERROR_TIMEOUT) { str_reason = _("Message may have not been sent " - "because a time out occurred:"); + "because a timeout occurred:"); } else if (error == MSN_MSG_ERROR_SB) { @@ -962,8 +964,15 @@ { int reason = MSN_SB_ERROR_UNKNOWN; - if (error == 217) + if (error == 215) + { + gaim_debug_info("msn", "Invited user already in switchboard\n"); + return; + } + else if (error == 217) + { reason = MSN_SB_ERROR_USER_OFFLINE; + } cal_error_helper(trans, reason); }