From b5b392f1b06f3910ea9cc27b32cb82fea34d6bfa Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 4 Jun 2019 17:07:44 +0300 Subject: more fixes for #1963 --- include/delphi/m_protosvc.inc | 3 --- plugins/Clist_modern/src/modern_clcpaint.cpp | 3 --- plugins/Clist_modern/src/modern_clcpaint.h | 3 --- protocols/Gadu-Gadu/src/gg_proto.cpp | 1 - protocols/Gadu-Gadu/src/gg_proto.h | 1 - protocols/ICQCorp/src/protocol.cpp | 2 -- protocols/ICQCorp/src/protocol.h | 1 - protocols/JabberG/src/jabber_util.cpp | 1 - 8 files changed, 15 deletions(-) diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc index 6846081c76..bd27ef33ac 100644 --- a/include/delphi/m_protosvc.inc +++ b/include/delphi/m_protosvc.inc @@ -104,9 +104,6 @@ const PF2_LONGAWAY = $00000008; // NA on ICQ, Away on MSN PF2_LIGHTDND = $00000010; // Occupied on ICQ, Busy on MSN PF2_HEAVYDND = $00000020; // DND on ICQ - PF2_FREECHAT = $00000040; - PF2_OUTTOLUNCH = $00000080; - PF2_ONTHEPHONE = $00000100; PF2_IDLE = $00000200; //added during 0.3.4 (2004/09/13) PFLAGNUM_3 = 3; //the status modes that the protocol supports diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp index 1d8df8f040..04280de335 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.cpp +++ b/plugins/Clist_modern/src/modern_clcpaint.cpp @@ -54,10 +54,7 @@ const char* CLCPaint::HASHTEXT[hi_LastItem] = { "DND", "NA", "OCCUPIED", - "FREECHAT", "INVISIBLE", - "OUTTOLUNCH", - "ONTHEPHONE", "IDLE", "OFFLINE", "Row", diff --git a/plugins/Clist_modern/src/modern_clcpaint.h b/plugins/Clist_modern/src/modern_clcpaint.h index 2496f4a0b6..d6bb60af40 100644 --- a/plugins/Clist_modern/src/modern_clcpaint.h +++ b/plugins/Clist_modern/src/modern_clcpaint.h @@ -62,10 +62,7 @@ private: hi_DND, hi_NA, hi_OCCUPIED, - hi_FREECHAT, hi_INVISIBLE, - hi_OUTTOLUNCH, - hi_ONTHEPHONE, hi_IDLE, hi_OFFLINE, hi_Row, diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp index d4ee9c7520..6554b18d49 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.cpp +++ b/protocols/Gadu-Gadu/src/gg_proto.cpp @@ -112,7 +112,6 @@ GaduProto::~GaduProto() if (modemsg.online) mir_free(modemsg.online); if (modemsg.away) mir_free(modemsg.away); if (modemsg.dnd) mir_free(modemsg.dnd); - if (modemsg.freechat) mir_free(modemsg.freechat); if (modemsg.invisible) mir_free(modemsg.invisible); if (modemsg.offline) mir_free(modemsg.offline); } diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h index ada0efe1d8..2e9db7566c 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.h +++ b/protocols/Gadu-Gadu/src/gg_proto.h @@ -239,7 +239,6 @@ struct GaduProto : public PROTO wchar_t *online; wchar_t *away; wchar_t *dnd; - wchar_t *freechat; wchar_t *invisible; wchar_t *offline; }; diff --git a/protocols/ICQCorp/src/protocol.cpp b/protocols/ICQCorp/src/protocol.cpp index 7cffa8094a..bdf3686354 100644 --- a/protocols/ICQCorp/src/protocol.cpp +++ b/protocols/ICQCorp/src/protocol.cpp @@ -1798,7 +1798,6 @@ void ICQ::processTcpPacket(Packet &packet, unsigned int hSocket) case ICQ_CMDxTCP_READxOCCUPIEDxMSG: case ICQ_CMDxTCP_READxNAxMSG: case ICQ_CMDxTCP_READxDNDxMSG: - case ICQ_CMDxTCP_READxFREECHATxMSG: Netlib_Logf(hNetlibUser, "[tcp] %d requested read of away message.\n", checkUin); packet >> theTCPSequence; @@ -1872,7 +1871,6 @@ void ICQ::processTcpPacket(Packet &packet, unsigned int hSocket) case ICQ_CMDxTCP_READxOCCUPIEDxMSG: case ICQ_CMDxTCP_READxNAxMSG: case ICQ_CMDxTCP_READxDNDxMSG: - case ICQ_CMDxTCP_READxFREECHATxMSG: packet >> theTCPSequence; addAwayMsg(u, message, theTCPSequence, time(0)); break; diff --git a/protocols/ICQCorp/src/protocol.h b/protocols/ICQCorp/src/protocol.h index ba75de163b..70d6544acd 100644 --- a/protocols/ICQCorp/src/protocol.h +++ b/protocols/ICQCorp/src/protocol.h @@ -98,7 +98,6 @@ const unsigned short ICQ_CMDxTCP_READxAWAYxMSG = 0x03E8; const unsigned short ICQ_CMDxTCP_READxOCCUPIEDxMSG = 0x03E9; const unsigned short ICQ_CMDxTCP_READxNAxMSG = 0x03EA; const unsigned short ICQ_CMDxTCP_READxDNDxMSG = 0x03EB; -const unsigned short ICQ_CMDxTCP_READxFREECHATxMSG = 0x03EC; const unsigned short ICQ_CMDxTCP_HANDSHAKE = 0x03FF; const unsigned short ICQ_CMDxTCP_HANDSHAKE2 = 0x04FF; const unsigned short ICQ_CMDxTCP_HANDSHAKE3 = 0x02FF; diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp index 2def1c9bc5..cfa261de6b 100755 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -197,7 +197,6 @@ void JabberHttpUrlDecode(wchar_t *str) int JabberCombineStatus(int status1, int status2) { // Combine according to the following priority (high to low) - // ID_STATUS_FREECHAT // ID_STATUS_ONLINE // ID_STATUS_DND // ID_STATUS_AWAY -- cgit v1.2.3