changeset 20440:5ecaa00090d7

Always get the full contact list too, as we need it for the reverse list etc. Fixes #983
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 27 May 2007 17:33:50 +0000
parents bee467c81570
children 9053156d016a
files libpurple/protocols/msn/contact.c libpurple/protocols/msn/notification.c
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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 */
--- 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
 }