fixes #1963 (Remove Free for Chat, On the Phone and Out to Lunch statuses completely)

3 files changed, 5 insertions, 23 deletions

diff --git a/protocols/Steam/src/steam_contacts.cpp b/protocols/Steam/src/steam_contacts.cpp
index e05a3f83a4..f9264b7b7b 100644
--- a/protocols/Steam/src/steam_contacts.cpp
+++ b/protocols/Steam/src/steam_contacts.cpp
@@ -18,18 +18,7 @@ void CSteamProto::SetContactStatus(MCONTACT hContact, WORD status)
 	setWord(hContact, "Status", status);
 
 	// Special handling of some statuses
-	switch (status)
-	{
-	case ID_STATUS_FREECHAT:
-		// Contact is looking to play, save it to as status message
-		db_set_ws(hContact, "CList", "StatusMsg", TranslateT("Looking to play"));
-		break;
-
-	case ID_STATUS_OUTTOLUNCH:
-		// Contact is looking to trade, save it to as status message
-		db_set_ws(hContact, "CList", "StatusMsg", TranslateT("Looking to trade"));
-		break;
-
+	switch (status) {
 	case ID_STATUS_OFFLINE:
 		// if contact is offline, remove played game info
 		delSetting(hContact, "GameID");
@@ -180,7 +169,7 @@ void CSteamProto::UpdateContactDetails(MCONTACT hContact, const JSONNode &data)
 	if (stateflags == PersonaStateFlag::None) {
 		// nothing special, either standard client or in different status (only online, I want to play, I want to trade statuses support this flags)
 		WORD status = getWord(hContact, "Status", ID_STATUS_OFFLINE);
-		if (status == ID_STATUS_ONLINE || status == ID_STATUS_OUTTOLUNCH || status == ID_STATUS_FREECHAT)
+		if (status == ID_STATUS_ONLINE)
 			setWString(hContact, "MirVer", L"Steam");
 	}
 	else if (contains_flag(stateflags, PersonaStateFlag::InJoinableGame)) {
diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp
index cda3349382..f45385e486 100644
--- a/protocols/Steam/src/steam_proto.cpp
+++ b/protocols/Steam/src/steam_proto.cpp
@@ -190,11 +190,11 @@ INT_PTR CSteamProto::GetCaps(int type, MCONTACT)
 	case PFLAGNUM_1:
 		return PF1_IM | PF1_BASICSEARCH | PF1_SEARCHBYNAME | PF1_AUTHREQ | PF1_SERVERCLIST | PF1_ADDSEARCHRES | PF1_MODEMSGRECV;
 	case PFLAGNUM_2:
-		return PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_HEAVYDND | PF2_OUTTOLUNCH | PF2_FREECHAT;
+		return PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_HEAVYDND;
 	case PFLAGNUM_4:
 		return PF4_AVATARS | PF4_NOCUSTOMAUTH | PF4_NOAUTHDENYREASON | PF4_FORCEAUTH | PF4_SUPPORTIDLE | PF4_SUPPORTTYPING;// | PF4_IMSENDOFFLINE;
 	case PFLAGNUM_5:
-		return PF2_HEAVYDND | PF2_OUTTOLUNCH | PF2_FREECHAT;
+		return PF2_HEAVYDND;
 	case PFLAG_UNIQUEIDTEXT:
 		return (INT_PTR)Translate("SteamID");
 	default:
@@ -259,8 +259,6 @@ int CSteamProto::SetStatus(int new_status)
 
 	case ID_STATUS_DND:
 	case ID_STATUS_OCCUPIED:
-	case ID_STATUS_ONTHEPHONE:
-	case ID_STATUS_OUTTOLUNCH:
 		new_status = ID_STATUS_NA;
 		break;
 
diff --git a/protocols/Steam/src/steam_utils.cpp b/protocols/Steam/src/steam_utils.cpp
index 47cd289725..cf00c1653e 100644
--- a/protocols/Steam/src/steam_utils.cpp
+++ b/protocols/Steam/src/steam_utils.cpp
@@ -14,10 +14,9 @@ WORD CSteamProto::SteamToMirandaStatus(PersonaState state)
 		return ID_STATUS_AWAY;

 	case PersonaState::Snooze:

 		return ID_STATUS_NA;

+

 	case PersonaState::LookingToTrade:

-		return ID_STATUS_OUTTOLUNCH;

 	case PersonaState::LookingToPlay:

-		return ID_STATUS_FREECHAT;

 	default:

 		return ID_STATUS_ONLINE;

 	}

@@ -37,10 +36,6 @@ PersonaState CSteamProto::MirandaToSteamState(int status)
 		return PersonaState::Away;

 	case ID_STATUS_NA:

 		return PersonaState::Snooze;

-	case ID_STATUS_OUTTOLUNCH:

-		return PersonaState::LookingToTrade;

-	case ID_STATUS_FREECHAT:

-		return PersonaState::LookingToPlay;

 	default:

 		return PersonaState::Online;

 	}