From 11354effc08a8d1b1b0fc95b5c473256f33c8ec3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 21 Dec 2014 17:52:29 +0000 Subject: - MS_PROTO_ISPROTOCOLLOADED now switched back to protocols instead of accounts; - calls of MS_PROTO_ISPROTOCOLLOADED replaced with ProtoGetAccount() wherever possible git-svn-id: http://svn.miranda-ng.org/main/trunk@11558 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/UserInfoEx/src/commonheaders.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'plugins/UserInfoEx/src') diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h index e4ed409e68..ca2de3e7a8 100644 --- a/plugins/UserInfoEx/src/commonheaders.h +++ b/plugins/UserInfoEx/src/commonheaders.h @@ -225,13 +225,10 @@ static FORCEINLINE BOOL IsProtoOnline(LPSTR pszProto) { return pszProto && pszProto[0] && CallProtoService(pszProto, PS_GETSTATUS, NULL, NULL) >= ID_STATUS_ONLINE; } -static FORCEINLINE BOOL IsProtoLoaded(LPSTR pszProto) -{ - return (CallService(MS_PROTO_ISPROTOCOLLOADED, NULL, (LPARAM)pszProto) != NULL); -} + static FORCEINLINE BOOL IsProtoAccountEnabled(PROTOACCOUNT *pAcc) { - return (pAcc->bIsEnabled && IsProtoLoaded(pAcc->szModuleName)); + return (pAcc->bIsEnabled && ProtoGetAccount(pAcc->szModuleName)); } typedef HRESULT (STDAPICALLTYPE *pfnDwmIsCompositionEnabled)(BOOL *); -- cgit v1.2.3