From b078dfb78c89aea87cd422eae52694738e473cf3 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Sun, 21 Jul 2019 19:59:18 +0300 Subject: Restore "Free for chat" status support (fixes #1963) --- include/delphi/m_protosvc.inc | 1 + include/delphi/m_skin.inc | 3 ++- include/delphi/statusmodes.inc | 3 ++- include/m_protosvc.h | 2 ++ include/m_skin.h | 3 ++- include/statusmodes.h | 3 ++- 6 files changed, 11 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc index bd27ef33ac..f56e18adb2 100644 --- a/include/delphi/m_protosvc.inc +++ b/include/delphi/m_protosvc.inc @@ -104,6 +104,7 @@ 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_IDLE = $00000200; //added during 0.3.4 (2004/09/13) PFLAGNUM_3 = 3; //the status modes that the protocol supports diff --git a/include/delphi/m_skin.inc b/include/delphi/m_skin.inc index d487bcc5c1..862b309305 100644 --- a/include/delphi/m_skin.inc +++ b/include/delphi/m_skin.inc @@ -103,7 +103,8 @@ const SKINICON_STATUS_NA = 3; SKINICON_STATUS_OCCUPIED = 4; SKINICON_STATUS_DND = 5; - SKINICON_STATUS_INVISIBLE = 6; + SKINICON_STATUS_FREE4CHAT = 6; + SKINICON_STATUS_INVISIBLE = 7; function Skin_LoadProtoIcon(protoName:PAnsiChar; iconId:int; big:byte) : HICON; stdcall; external AppDLL name 'Skin_LoadProtoIcon'; diff --git a/include/delphi/statusmodes.inc b/include/delphi/statusmodes.inc index 795522d856..9628d86644 100644 --- a/include/delphi/statusmodes.inc +++ b/include/delphi/statusmodes.inc @@ -41,7 +41,8 @@ const ID_STATUS_DND = 40074; ID_STATUS_NA = 40075; ID_STATUS_OCCUPIED = 40076; - ID_STATUS_INVISIBLE = 40077; + ID_STATUS_FREECHAT = 40077; + ID_STATUS_INVISIBLE = 40078; ID_STATUS_IDLE = 40081; // do not use as a status ID_STATUS_MIN = ID_STATUS_OFFLINE; diff --git a/include/m_protosvc.h b/include/m_protosvc.h index d511666fcb..f137982ebd 100644 --- a/include/m_protosvc.h +++ b/include/m_protosvc.h @@ -94,6 +94,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define PF2_LONGAWAY 0x00000008 // NA on ICQ, Away on MSN #define PF2_LIGHTDND 0x00000010 // Occupied on ICQ, Busy on MSN #define PF2_HEAVYDND 0x00000020 // DND on ICQ +#define PF2_FREECHAT 0x00000040 #define PF2_IDLE 0x00000200 #define PF2_NONE 0x10000000 // protocol has no statuses at all @@ -116,6 +117,7 @@ static __inline unsigned long Proto_Status2Flag(int status) case ID_STATUS_NA: return PF2_LONGAWAY; case ID_STATUS_OCCUPIED: return PF2_LIGHTDND; case ID_STATUS_DND: return PF2_HEAVYDND; + case ID_STATUS_FREECHAT: return PF2_FREECHAT; case ID_STATUS_IDLE: return PF2_IDLE; } return 0; diff --git a/include/m_skin.h b/include/m_skin.h index 8a9f27b1ca..deb3cc6dc5 100644 --- a/include/m_skin.h +++ b/include/m_skin.h @@ -105,7 +105,8 @@ EXTERN_C MIR_APP_DLL(HANDLE) Skin_GetIconHandle(int idx); #define SKINICON_STATUS_NA 3 #define SKINICON_STATUS_OCCUPIED 4 #define SKINICON_STATUS_DND 5 -#define SKINICON_STATUS_INVISIBLE 6 +#define SKINICON_STATUS_FREE4CHAT 6 +#define SKINICON_STATUS_INVISIBLE 7 ///////////////////////////////////////////////////////////////////////////////////////// // Loads an icon representing the status mode for a particular protocol. diff --git a/include/statusmodes.h b/include/statusmodes.h index e712dd51f1..4528be307d 100644 --- a/include/statusmodes.h +++ b/include/statusmodes.h @@ -49,7 +49,8 @@ __forceinline bool IsStatusConnecting(int iStatus) #define ID_STATUS_DND 40074 #define ID_STATUS_NA 40075 #define ID_STATUS_OCCUPIED 40076 -#define ID_STATUS_INVISIBLE 40077 +#define ID_STATUS_FREECHAT 40077 +#define ID_STATUS_INVISIBLE 40078 #define ID_STATUS_IDLE 40081 /* do not use as a status */ #define ID_STATUS_MIN ID_STATUS_OFFLINE -- cgit v1.2.3