# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1235010349 0
# Node ID 2fe359bda5b74c8ce1d958375b8aa4c01d33c9ad
# Parent  c729cdeb88c8aa63ec6e71d62b46a9e40eb272fc# Parent  aaee7cf806d0a409862caf0605b9d2ede56a50ef
merge of '4c705f4c1149e001f86ed88ffc64ccb5acbc8261'
     and 'b2f78ca55cd55a786a44a2879716051f2a799ce6'

diff -r aaee7cf806d0 -r 2fe359bda5b7 libpurple/protocols/msn/contact.c
--- 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);
 	}
 }