From ef1a349d88912a89a8dd20ca1dcb342b6dc9c2ff Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 27 May 2019 18:45:43 +0300
Subject: fixes #1963 (Remove Free for Chat, On the Phone and Out to Lunch
 statuses completely)

---
 protocols/MSN/src/msn_contact.cpp | 2 +-
 protocols/MSN/src/msn_misc.cpp    | 7 -------
 protocols/MSN/src/msn_proto.cpp   | 5 +----
 3 files changed, 2 insertions(+), 12 deletions(-)

(limited to 'protocols/MSN/src')

diff --git a/protocols/MSN/src/msn_contact.cpp b/protocols/MSN/src/msn_contact.cpp
index c0d655c147..39bdbd1ac2 100644
--- a/protocols/MSN/src/msn_contact.cpp
+++ b/protocols/MSN/src/msn_contact.cpp
@@ -91,7 +91,7 @@ void CMsnProto::MSN_SetContactDb(MCONTACT hContact, const char *szEmail)
 		}
 
 		if (cont->netId == NETID_MOB) {
-			setWord(hContact, "Status", ID_STATUS_ONTHEPHONE);
+			setWord(hContact, "Status", ID_STATUS_ONLINE);
 			setString(hContact, "MirVer", "SMS");
 		}
 	}
diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index 03f595147f..fc9073d73d 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -30,8 +30,6 @@ const char* CMsnProto::MirandaStatusToMSN(int status)
 {
 	switch (status) {
 		case ID_STATUS_OFFLINE:		return "FLN";
-		case ID_STATUS_ONTHEPHONE:	return "PHN";
-		case ID_STATUS_OUTTOLUNCH:	return "LUN";
 		case ID_STATUS_NA:
 		case ID_STATUS_AWAY:		return "AWY";
 		case ID_STATUS_DND:
@@ -47,8 +45,6 @@ WORD CMsnProto::MSNStatusToMiranda(const char *status)
 	switch ((*(PDWORD)status & 0x00FFFFFF) | 0x20000000) {
 		case ' LDI': return ID_STATUS_IDLE;
 		case ' NLN': return ID_STATUS_ONLINE;
-		case ' NHP': return ID_STATUS_ONTHEPHONE;
-		case ' NUL': return ID_STATUS_OUTTOLUNCH;
 		case ' BRB':
 		case ' YWA': return ID_STATUS_AWAY;
 		case ' YSB': return ID_STATUS_OCCUPIED;
@@ -66,10 +62,7 @@ char** CMsnProto::GetStatusMsgLoc(int status)
 		ID_STATUS_DND,
 		ID_STATUS_NA,
 		ID_STATUS_OCCUPIED,
-		ID_STATUS_FREECHAT,
 		ID_STATUS_INVISIBLE,
-		ID_STATUS_ONTHEPHONE,
-		ID_STATUS_OUTTOLUNCH,
 	};
 
 	for (int i = 0; i < MSN_NUM_MODES; i++)
diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index bd26e678a3..655a0c048e 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -632,7 +632,7 @@ INT_PTR CMsnProto::GetCaps(int type, MCONTACT)
 			PF1_FILERECV | PF1_VISLIST | PF1_MODEMSG;
 
 	case PFLAGNUM_2:
-		return PF2_ONLINE | PF2_SHORTAWAY | PF2_LIGHTDND | PF2_INVISIBLE | PF2_ONTHEPHONE | PF2_IDLE;
+		return PF2_ONLINE | PF2_SHORTAWAY | PF2_LIGHTDND | PF2_INVISIBLE | PF2_IDLE;
 
 	case PFLAGNUM_3:
 		return PF2_ONLINE | PF2_SHORTAWAY | PF2_LIGHTDND;
@@ -640,9 +640,6 @@ INT_PTR CMsnProto::GetCaps(int type, MCONTACT)
 	case PFLAGNUM_4:
 		return PF4_FORCEAUTH | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_SUPPORTIDLE | PF4_IMSENDOFFLINE | PF4_NOAUTHDENYREASON;
 
-	case PFLAGNUM_5:
-		return PF2_ONTHEPHONE;
-
 	case PFLAG_UNIQUEIDTEXT:
 		return (INT_PTR)Translate("Live ID");
 
-- 
cgit v1.2.3