From ef1a349d88912a89a8dd20ca1dcb342b6dc9c2ff Mon Sep 17 00:00:00 2001 From: George Hazan 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/IRCG/src/commandmonitor.cpp | 7 ------- protocols/IRCG/src/ircproto.cpp | 6 +++--- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'protocols/IRCG/src') diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp index 67a6092e90..9f3e6cd526 100644 --- a/protocols/IRCG/src/commandmonitor.cpp +++ b/protocols/IRCG/src/commandmonitor.cpp @@ -339,12 +339,6 @@ bool CIrcProto::OnIrc_SETAWAY(const CIrcMessage *pmsg) case ID_STATUS_OCCUPIED: DoPerform("Event: Occupied"); break; - case ID_STATUS_OUTTOLUNCH: - DoPerform("Event: Out for lunch"); - break; - case ID_STATUS_ONTHEPHONE: - DoPerform("Event: On the phone"); - break; default: m_iStatus = ID_STATUS_AWAY; DoPerform("Event: Away"); @@ -2355,7 +2349,6 @@ bool CIrcProto::DoOnConnect(const CIrcMessage*) if (IsConnected()) { DoPerform(_T2A(m_info.sNetwork)); switch (Temp) { - case ID_STATUS_FREECHAT: DoPerform("Event: Free for chat"); break; case ID_STATUS_ONLINE: DoPerform("Event: Available"); break; } } diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp index d05c5a5027..4e70654649 100644 --- a/protocols/IRCG/src/ircproto.cpp +++ b/protocols/IRCG/src/ircproto.cpp @@ -721,12 +721,12 @@ int CIrcProto::SetStatusInternal(int iNewStatus, bool bIsInternal) if (!bIsInternal) m_iDesiredStatus = iNewStatus; - if ((iNewStatus == ID_STATUS_ONLINE || iNewStatus == ID_STATUS_AWAY || iNewStatus == ID_STATUS_FREECHAT) && !IsConnected()) //go from offline to online + if ((iNewStatus == ID_STATUS_ONLINE || iNewStatus == ID_STATUS_AWAY) && !IsConnected()) //go from offline to online { if (!m_bConnectThreadRunning) ConnectToServer(); } - else if ((iNewStatus == ID_STATUS_ONLINE || iNewStatus == ID_STATUS_FREECHAT) && IsConnected() && m_iStatus == ID_STATUS_AWAY) //go to online while connected + else if (iNewStatus == ID_STATUS_ONLINE && IsConnected() && m_iStatus == ID_STATUS_AWAY) //go to online while connected { m_statusMessage = L""; PostIrcMessage(L"/AWAY"); @@ -784,7 +784,7 @@ HANDLE CIrcProto::GetAwayMsg(MCONTACT hContact) int CIrcProto::SetAwayMsg(int status, const wchar_t* msg) { switch (status) { - case ID_STATUS_ONLINE: case ID_STATUS_INVISIBLE: case ID_STATUS_FREECHAT: + case ID_STATUS_ONLINE: case ID_STATUS_INVISIBLE: case ID_STATUS_CONNECTING: case ID_STATUS_OFFLINE: break; -- cgit v1.2.3