From ba3753cb8f2aeda5ee1778ce95eb935c9e229419 Mon Sep 17 00:00:00 2001 From: Piotr Piastucki Date: Tue, 19 May 2015 23:52:48 +0000 Subject: - Better also save SOAP store access token. - Implemented handling of NFY MSGR\ABCH message although I never saw one (so untested). git-svn-id: http://svn.miranda-ng.org/main/trunk@13706 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MSN/src/msn_auth.cpp | 6 +++++- protocols/MSN/src/msn_commands.cpp | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'protocols') diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp index c2ca13612b..ae8bc6814b 100644 --- a/protocols/MSN/src/msn_auth.cpp +++ b/protocols/MSN/src/msn_auth.cpp @@ -238,6 +238,7 @@ int CMsnProto::MSN_GetPassportAuth(void) } else if (strcmp(addr, "storage.msn.com") == 0 && toks) { replaceStr(authStorageToken, ezxml_txt(toks)); + setString("authStorageToken", authStorageToken); } tokr = ezxml_next(tokr); @@ -687,6 +688,10 @@ void CMsnProto::LoadAuthTokensDB(void) hotAuthToken = strdup(dbv.pszVal); db_free(&dbv); } + if (getString("authStorageToken", &dbv) == 0) { + replaceStr(authStorageToken, dbv.pszVal); + db_free(&dbv); + } } void CMsnProto::SaveAuthTokensDB(void) @@ -695,7 +700,6 @@ void CMsnProto::SaveAuthTokensDB(void) setDword("authMethod", authMethod); setString("authUser", authUser); setString("authSSLToken", authSSLToken); - setString("authContactToken", authContactToken); setString("authUIC", authUIC); setString("authCookies", authCookies); setString("authStrToken", authStrToken); diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp index 7060fcbf85..e04d768ccc 100644 --- a/protocols/MSN/src/msn_commands.cpp +++ b/protocols/MSN/src/msn_commands.cpp @@ -1850,6 +1850,11 @@ LBL_InvalidCommand: mir_snprintf(szParam, sizeof(szParam), "%s %s", data.typeId, data.strMsgBytes); MSN_ReceiveMessage(info, cmdString, szParam); break; + } else if (!strcmp(data.typeId, "MSGR\\ABCH")) { + MimeHeaders tHeader; + msgBody = tHeader.readFromBuffer(msgBody); + MSN_ProcessNotificationMessage(msgBody, strlen(msgBody)); + break; } if (!strcmp(data.typeId, "MSGR\\PUT") || !strcmp(data.typeId, "MSGR\\DEL")) { -- cgit v1.2.3