# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1180287230 0
# Node ID 5ecaa00090d70965d08fea11f52da7d2a43f530c
# Parent  bee467c81570925d7cb1601c12aa855aec77910f
Always get the full contact list too, as we need it for the reverse list
etc.

Fixes #983

diff -r bee467c81570 -r 5ecaa00090d7 libpurple/protocols/msn/contact.c
--- a/libpurple/protocols/msn/contact.c	Sun May 27 17:00:06 2007 +0000
+++ b/libpurple/protocols/msn/contact.c	Sun May 27 17:33:50 2007 +0000
@@ -249,7 +249,7 @@
 	abLastChange = purple_account_get_string(session->account, "ablastChange", NULL);
 	dynamicItemLastChange = purple_account_get_string(session->account, "dynamicItemLastChange", NULL);
 
-#ifdef MSN_PARTIAL_ADDRESSBOOK
+#ifdef MSN_PARTIAL_LISTS
 	/* XXX: this should be enabled when we can correctly do partial
 	   syncs with the server. Currently we need to retrieve the whole
 	   list to detect sync issues */
diff -r bee467c81570 -r 5ecaa00090d7 libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Sun May 27 17:00:06 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Sun May 27 17:33:50 2007 +0000
@@ -1602,15 +1602,17 @@
 		session->passport_info.sl = atol(value);
 
 	/*starting retrieve the contact list*/
-#ifdef MSN_PARTIAL_ADDRESSBOOK
-	msn_userlist_load(session);
-#endif
+	clLastChange = purple_account_get_string(session->account, "CLLastChange", NULL);
 	session->contact = msn_contact_new(session);
-	clLastChange = purple_account_get_string(session->account, "CLLastChange", NULL);
+#ifdef MSN_PARTIAL_LISTS
+	/* msn_userlist_load defeats all attempts at trying to detect blist sync issues */
+	msn_userlist_load(session);
 	msn_get_contact_list(session->contact, clLastChange);
-#if 0
+#else
 	/* always get the full list? */
 	msn_get_contact_list(session->contact, NULL);
+#endif
+#if 0
 	msn_contact_connect(session->contact);
 #endif
 }