From 5da898f7cca8599ecff44b3fa10eafb753308a4d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 4 Apr 2018 20:25:20 +0300 Subject: - static function CLIST_INTERFACE::pfnGetAverageMode exported as Proto_GetAverageStatus - Proto_ActivateAccount is not exported anymore due to the lack of need --- include/delphi/m_clistint.inc | 6 +----- include/m_clistint.h | 1 - include/m_protocols.h | 6 +++--- 3 files changed, 4 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index 699b138f4f..97be0ac711 100644 --- a/include/delphi/m_clistint.inc +++ b/include/delphi/m_clistint.inc @@ -501,11 +501,7 @@ type * Miranda NG additions *************************************************************************************) - pfnGetContactIcon :function (hContact:TMCONTACT):int; cdecl; - pfnTrayCalcChanged :function (szChangedProto:PAnsiChar; averageMode:int; iProtoCount:int):int; cdecl; - pfnGetAverageMode :function (pNetProtoCount:pint):int; cdecl; - pfnInitAutoRebuild :procedure(hwnd:HWND); cdecl; - pfnSetContactCheckboxes:procedure(cc:PClcContact; checked:int); cdecl; + pfnGetContactIcon: function (hContact:TMCONTACT):int; cdecl; end; function Clist_GetInterface : PCLIST_INTERFACE; stdcall; external AppDll; diff --git a/include/m_clistint.h b/include/m_clistint.h index 6a58baf1c1..81865b6ea7 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -485,7 +485,6 @@ struct CLIST_INTERFACE *************************************************************************************/ int (*pfnGetContactIcon)(MCONTACT hContact); int (*pfnTrayCalcChanged)(const char *szChangedProto, int averageMode, int iProtoCount); - int (*pfnGetAverageMode)(int *pNetProtoCount); void (*pfnInitAutoRebuild)(HWND hwnd); void (*pfnSetContactCheckboxes)(ClcContact *cc, int checked); }; diff --git a/include/m_protocols.h b/include/m_protocols.h index 3aaf125906..cc1e8fe0e0 100644 --- a/include/m_protocols.h +++ b/include/m_protocols.h @@ -300,10 +300,10 @@ MIR_APP_DLL(LIST&) Accounts(void); EXTERN_C MIR_APP_DLL(PROTOACCOUNT*) Proto_CreateAccount(const char *pszInternal, const char *pszBaseProto, const wchar_t *ptszAccountName); ///////////////////////////////////////////////////////////////////////////////////////// -// constructs the appropriate PROTOACCOUNT::ppro member if needed -// returns true if succeeded +// calculates the average protocol status among all visible & active accounts +// returns the common status or -1 if statuses differ -EXTERN_C MIR_APP_DLL(bool) Proto_ActivateAccount(PROTOACCOUNT *pAccount); +EXTERN_C MIR_APP_DLL(int) Proto_GetAverageStatus(int *pAccountNumber = nullptr); ///////////////////////////////////////////////////////////////////////////////////////// // retrieves an account's interface by its physical name (database module) -- cgit v1.2.3