From e9bd09e71e1d12803e0eec86a8e0a039c9d4e755 Mon Sep 17 00:00:00 2001
From: Piotr Piastucki <leech.miranda@gmail.com>
Date: Sat, 16 May 2015 07:45:16 +0000
Subject: Set isConnectSuccess bool, maybe prevents possible crash on spurious
 XFR? Fixed status mode change and setting status text

git-svn-id: http://svn.miranda-ng.org/main/trunk@13614 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/MSN/src/msn_commands.cpp | 1 +
 protocols/MSN/src/msn_misc.cpp     | 5 ++---
 protocols/MSN/src/msn_threads.cpp  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'protocols')

diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index 116d82c233..9a9e2e7958 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -1194,6 +1194,7 @@ LBL_InvalidCommand:
 			else
 			{
 				msnLoggedIn = true;
+				isConnectSuccess = true;
 				MSN_SetServerStatus(m_iStatus);
 				MSN_EnableMenuItems(true);
 				MSN_RefreshContactList();
diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index eee9746688..1d57af93b3 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -603,6 +603,7 @@ void CMsnProto::MSN_SendStatusMessage(const char* msg)
 	if (!msnLoggedIn)
 		return;
 
+	MSN_SetServerStatus(m_iDesiredStatus);
 	/* FIXME: Currently not implemented, shuold be set on status change anyway 
 
 	char* msgEnc = HtmlEncode(msg ? msg : "");
@@ -802,10 +803,9 @@ void CMsnProto::MSN_SetServerStatus(int newStatus)
 		}
 
 		char** msgptr = GetStatusMsgLoc(newStatus);
-		/* FIXME: This is what Skype client sends
+		/* FIXME: This is what Skype client sends */
 		myFlags = 0;
 		myFlagsEx = cap_SupportsSDrive | cap_SupportsActivities;
-		*/
 		int sz = mir_snprintf(szMsg, SIZEOF(szMsg),
 			"<user>"
 			"<sep n=\"PE\" epid=\"%s\"><VER>%s</VER><TYP>11</TYP><Capabilities>0:0</Capabilities></sep>"
@@ -830,7 +830,6 @@ void CMsnProto::MSN_SetServerStatus(int newStatus)
 			"Publication: 1.0\r\n"
 			"Uri: /user\r\n"
 			"Content-Type: application/user+xml\r\n"
-			"Status-Priority: low\r\n"
 			"Content-Length: %d\r\n\r\n%s",
 			GetMyNetID(), MyOptions.szEmail,
 			GetMyNetID(), MyOptions.szEmail,
diff --git a/protocols/MSN/src/msn_threads.cpp b/protocols/MSN/src/msn_threads.cpp
index 382c113891..0eee4578c4 100644
--- a/protocols/MSN/src/msn_threads.cpp
+++ b/protocols/MSN/src/msn_threads.cpp
@@ -706,7 +706,7 @@ BYTE* HReadBuffer::surelyRead(size_t parBytes)
 		}
 	}
 
-	while ((startOffset + parBytes) > totalDataSize) {
+  	while ((startOffset + parBytes) > totalDataSize) {
 		int recvResult = owner->recv((char*)buffer + totalDataSize, owner->mDataSize - totalDataSize);
 
 		if (recvResult <= 0)
-- 
cgit v1.2.3