From 9556b03ca5f9cb26b16b414faaaea90559843e0c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 19 Jun 2015 15:40:09 +0000 Subject: unused helper removed git-svn-id: http://svn.miranda-ng.org/main/trunk@14263 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdautoaway/src/autoaway.cpp | 10 ---------- src/core/stdaway/src/sendmsg.cpp | 10 ---------- src/mir_app/src/miranda.h | 2 -- src/mir_app/src/protocols.cpp | 7 +------ 4 files changed, 1 insertion(+), 28 deletions(-) (limited to 'src') diff --git a/src/core/stdautoaway/src/autoaway.cpp b/src/core/stdautoaway/src/autoaway.cpp index 9084ab7f61..c8ac72f2ca 100644 --- a/src/core/stdautoaway/src/autoaway.cpp +++ b/src/core/stdautoaway/src/autoaway.cpp @@ -35,16 +35,6 @@ static int AutoAwaySound(WPARAM, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////// -static bool Proto_IsAccountEnabled(PROTOACCOUNT *pa) -{ - return pa && ((pa->bIsEnabled && !pa->bDynDisabled) || pa->bOldProto); -} - -static bool Proto_IsAccountLocked(PROTOACCOUNT *pa) -{ - return pa && db_get_b(NULL, pa->szModuleName, "LockMainStatus", 0) != 0; -} - static void Proto_SetStatus(const char *szProto, unsigned status) { if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_MODEMSGSEND) { diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp index f40abdec32..68db851844 100644 --- a/src/core/stdaway/src/sendmsg.cpp +++ b/src/core/stdaway/src/sendmsg.cpp @@ -27,16 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static DWORD protoModeMsgFlags; static HWND hwndStatusMsg; -static bool Proto_IsAccountEnabled(PROTOACCOUNT *pa) -{ - return pa && ((pa->bIsEnabled && !pa->bDynDisabled) || pa->bOldProto); -} - -static bool Proto_IsAccountLocked(PROTOACCOUNT *pa) -{ - return pa && db_get_b(NULL, pa->szModuleName, "LockMainStatus", 0) != 0; -} - static const TCHAR *GetDefaultMessage(int status) { switch(status) { diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h index 3a7f358eac..6b4939f2c1 100644 --- a/src/mir_app/src/miranda.h +++ b/src/mir_app/src/miranda.h @@ -150,8 +150,6 @@ PROTOACCOUNT* Proto_CreateAccount(const char *szModuleName, const char *szBasePr PROTOACCOUNT* __fastcall Proto_GetAccount(MCONTACT hContact); -bool __fastcall Proto_IsAccountLocked(PROTOACCOUNT *pa); - PROTO_INTERFACE* AddDefaultAccount(const char *szProtoName); int FreeDefaultAccount(PROTO_INTERFACE* ppi); diff --git a/src/mir_app/src/protocols.cpp b/src/mir_app/src/protocols.cpp index 1d81c61188..e1fd602abc 100644 --- a/src/mir_app/src/protocols.cpp +++ b/src/mir_app/src/protocols.cpp @@ -338,16 +338,11 @@ MIR_APP_DLL(bool) Proto_IsAccountEnabled(const PROTOACCOUNT *pa) return pa && ((pa->bIsEnabled && !pa->bDynDisabled) || pa->bOldProto); } -bool __fastcall Proto_IsAccountLocked(PROTOACCOUNT *pa) +MIR_APP_DLL(bool) Proto_IsAccountLocked(const PROTOACCOUNT *pa) { return pa && db_get_b(NULL, pa->szModuleName, "LockMainStatus", 0) != 0; } -MIR_APP_DLL(bool) Proto_IsAccountLocked(const char *pszModuleName) -{ - return Proto_IsAccountLocked(Proto_GetAccount(pszModuleName)); -} - ///////////////////////////////////////////////////////////////////////////////////////// MIR_APP_DLL(int) ProtoServiceExists(const char *szModule, const char *szService) -- cgit v1.2.3