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/Clist_modern/src/modern_clistsettings.cpp | |
| 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/Clist_modern/src/modern_clistsettings.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_clistsettings.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp index f53d632183..55f5438e15 100644 --- a/plugins/Clist_modern/src/modern_clistsettings.cpp +++ b/plugins/Clist_modern/src/modern_clistsettings.cpp @@ -34,7 +34,6 @@ static int displayNameCacheSize; LIST<ClcCacheEntry> clistCache(50, NumericKeySortT);
-char* GetProtoForContact(MCONTACT hContact);
int GetStatusForContact(MCONTACT hContact, char *szProto);
TCHAR* UnknownConctactTranslatedName = NULL;
@@ -196,7 +195,7 @@ void cliCheckCacheItem(ClcCacheEntry *pdnce) }
if (pdnce->m_cache_cszProto == NULL && pdnce->m_bProtoNotExists == FALSE) {
- pdnce->m_cache_cszProto = GetProtoForContact(pdnce->hContact);
+ pdnce->m_cache_cszProto = GetContactProto(pdnce->hContact);
if (pdnce->m_cache_cszProto == NULL)
pdnce->m_bProtoNotExists = FALSE;
else if (pdnce->m_cache_cszProto && pdnce->tszName)
@@ -207,7 +206,7 @@ void cliCheckCacheItem(ClcCacheEntry *pdnce) pdnce->getName();
else if (pdnce->isUnknown && pdnce->m_cache_cszProto && pdnce->m_bProtoNotExists == TRUE && g_flag_bOnModulesLoadedCalled) {
- if (CallService(MS_PROTO_ISPROTOCOLLOADED, 0, (LPARAM)pdnce->m_cache_cszProto) == 0) {
+ if (ProtoGetAccount(pdnce->m_cache_cszProto) == NULL) {
pdnce->m_bProtoNotExists = FALSE;
pdnce->getName();
}
@@ -315,11 +314,6 @@ char *GetContactCachedProtocol(MCONTACT hContact) return NULL;
}
-char* GetProtoForContact(MCONTACT hContact)
-{
- return (char*)CallService(MS_PROTO_GETCONTACTBASEACCOUNT, hContact, 0);
-}
-
int GetStatusForContact(MCONTACT hContact, char *szProto)
{
return (szProto) ? (int)(db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE)) : ID_STATUS_OFFLINE;
|