# HG changeset patch # User Elliott Sales de Andrade # Date 1328245038 0 # Node ID ab9025b4613428d749c0848f609541ae6cce5419 # Parent 1a265986ed37c8dc9f5c00a5b881b140411ecf5f Switch to ABFindContactsPaged instead of ABFindAll. diff -r 1a265986ed37 -r ab9025b46134 libpurple/protocols/msn/contact.c --- a/libpurple/protocols/msn/contact.c Fri Feb 03 01:29:43 2012 +0000 +++ b/libpurple/protocols/msn/contact.c Fri Feb 03 04:57:18 2012 +0000 @@ -897,7 +897,7 @@ return FALSE; } - result = xmlnode_get_child(node, "Body/ABFindAllResponse/ABFindAllResult"); + result = xmlnode_get_child(node, "Body/ABFindContactsPagedResponse/ABFindContactsPagedResult"); if (result == NULL) { purple_debug_misc("msn", "Received no address book update\n"); return TRUE; @@ -906,7 +906,7 @@ /* I don't see this "groups" tag documented on msnpiki, need to find out if they are really there, and update msnpiki */ /*Process Group List*/ - groups = xmlnode_get_child(result, "groups"); + groups = xmlnode_get_child(result, "Groups"); if (groups != NULL) { msn_parse_addressbook_groups(session, groups); } @@ -931,12 +931,12 @@ /*Process contact List*/ purple_debug_info("msn", "Process contact list...\n"); - contacts = xmlnode_get_child(result, "contacts"); + contacts = xmlnode_get_child(result, "Contacts"); if (contacts != NULL) { msn_parse_addressbook_contacts(session, contacts); } - abNode = xmlnode_get_child(result, "ab"); + abNode = xmlnode_get_child(result, "Ab"); if (abNode != NULL) { xmlnode *node2; char *tmp = NULL; diff -r 1a265986ed37 -r ab9025b46134 libpurple/protocols/msn/contact.h --- a/libpurple/protocols/msn/contact.h Fri Feb 03 01:29:43 2012 +0000 +++ b/libpurple/protocols/msn/contact.h Fri Feb 03 04:57:18 2012 +0000 @@ -142,11 +142,13 @@ "" /* Get AddressBook */ -#define MSN_GET_ADDRESS_SOAP_ACTION "http://www.msn.com/webservices/AddressBook/ABFindAll" +#define MSN_GET_ADDRESS_SOAP_ACTION "http://www.msn.com/webservices/AddressBook/ABFindContactsPaged" #define MSN_GET_ADDRESS_FULL_TIME "0001-01-01T00:00:00.0000000-08:00" #define MSN_GET_ADDRESS_UPDATE_XML \ - "true"\ - "%s" + ""\ + "true"\ + "%s"\ + "" #define MSN_GET_GLEAM_UPDATE_XML \ "%s"\ @@ -171,11 +173,11 @@ ""\ ""\ ""\ - ""\ - "00000000-0000-0000-0000-000000000000"\ + ""\ "Full"\ + "AB AllGroups CircleResult"\ "%s"\ - ""\ + ""\ ""\ ""