Mercurial > pidgin
changeset 25493:2fe359bda5b7
merge of '4c705f4c1149e001f86ed88ffc64ccb5acbc8261'
and 'b2f78ca55cd55a786a44a2879716051f2a799ce6'
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Thu, 19 Feb 2009 02:25:49 +0000 |
| parents | c729cdeb88c8 (diff) aaee7cf806d0 (current diff) |
| children | 4ea0f3edd973 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/contact.c Wed Feb 18 20:11:14 2009 +0000 +++ b/libpurple/protocols/msn/contact.c Thu Feb 19 02:25:49 2009 +0000 @@ -205,6 +205,7 @@ purple_debug_error("msn", "Operation {%s} failed. No response received from server.\n", msn_contact_operation_str(state->action)); + msn_session_set_error(state->session, MSN_ERROR_BAD_BLIST, NULL); return; } @@ -916,8 +917,7 @@ /* msn_get_address_book(session, NULL, NULL); */ - msn_session_disconnect(session); - purple_connection_error_reason(session->account->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Unable to retrieve MSN Address Book")); + msn_session_set_error(session, MSN_ERROR_BAD_BLIST, NULL); } }