diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-12-21 17:52:29 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-12-21 17:52:29 +0000 |
| commit | 11354effc08a8d1b1b0fc95b5c473256f33c8ec3 (patch) | |
| tree | 0b404c3b617605c13d02a3a0bedc06dbd0b1fb31 /plugins/UserInfoEx/src | |
| parent | 45216fbba8af5d8e9d4173808741df52fb5ded11 (diff) | |
- 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
Diffstat (limited to 'plugins/UserInfoEx/src')
| -rw-r--r-- | plugins/UserInfoEx/src/commonheaders.h | 7 |
1 files changed, 2 insertions, 5 deletions
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 *);
|