- Cache authContactToken after refresh in MSN_GetPassportAuth as this token expires already after 8 hours whereas other tokens like login persist 24h

- Fixed groupchat invite
- Fork Contact list Refresh on connect into background thread so that login is faster.


git-svn-id: http://svn.miranda-ng.org/main/trunk@13615 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 9 insertions, 1 deletions

diff --git a/protocols/MSN/src/msn_contact.cpp b/protocols/MSN/src/msn_contact.cpp
index e2ce150fca..9d2371ce3a 100644
--- a/protocols/MSN/src/msn_contact.cpp
+++ b/protocols/MSN/src/msn_contact.cpp
@@ -106,6 +106,7 @@ void CMsnProto::MSN_SetContactDb(MCONTACT hContact, const char *szEmail)
 

 void CMsnProto::AddDelUserContList(const char* email, const int list, const int netId, const bool del)

 {

+/*

 	char buf[512];

 	size_t sz;

 

@@ -125,6 +126,7 @@ void CMsnProto::AddDelUserContList(const char* email, const int list, const int
 		}

 		msnNsThread->sendPacket(del ? "RML" : "ADL", "%d\r\n%s", sz, buf);

 	}

+*/

 

 	if (del)

 		Lists_Remove(list, email);

@@ -252,21 +254,27 @@ bool CMsnProto::MSN_RefreshContactList(void)
 

 	if (GetMyNetID() != NETID_SKYPE)

 	{

+		// Get your own profile info

 		if (!MSN_SharingFindMembership()) return false;

 

 		if (m_iDesiredStatus == ID_STATUS_OFFLINE) return false;

 

+		// Get "classic" MSN contacts

 		if (!MSN_ABFind("ABFindContactsPaged", NULL)) return false;

-		MSN_ABRefreshClist();

+

+		// Get Skype contacts on linked profiles

+		if (!MSN_ABRefreshClist()) return false;

 

 		if (m_iDesiredStatus == ID_STATUS_OFFLINE) return false;

 

+		// Remove contacts not on server etc.

 		MSN_CleanupLists();

 

 		if (m_iDesiredStatus == ID_STATUS_OFFLINE) return false;

 

 		msnLoggedIn = true;

 

+		// Populate Contact list on MSN network to get status updates of contacts

 		MSN_CreateContList();

 		//MSN_StoreGetProfile();

 	}