diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-19 22:48:01 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-19 22:48:01 +0000 |
| commit | 95aa036670a1ce2c461ffd9bd3a586d191ee4675 (patch) | |
| tree | cd244db18622df3462166ed39593ca924c890f6b /plugins/Clist_modern | |
| parent | f6e0db0590e2f8feeacc29d4e50007fbe358f9d5 (diff) | |
- various icolib fixes;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@1061 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern')
| -rw-r--r-- | plugins/Clist_modern/src/modern_clcitems.cpp | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index 2325cef988..b8b99a48e5 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -754,7 +754,7 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, struc char szTemp[64];
TCHAR szGroupMask[256];
DWORD dwLocalMask;
- PDNCE pdnce = (PDNCE)pcli->pfnGetCacheEntry(hContact);
+ PDNCE pdnce = (PDNCE)pcli->pfnGetCacheEntry(hContact);
BOOL fEmbedded = dat->force_in_dialog;
// always hide subcontacts (but show them on embedded contact lists)
@@ -766,18 +766,15 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, struc }
if (g_CluiData.bMetaAvail && dat != NULL && dat->IsMetaContactsEnabled && g_szMetaModuleName && db_get_b(hContact, g_szMetaModuleName, "IsSubcontact", 0))
return -1; //subcontact
- if (pdnce && pdnce->isUnknown && !fEmbedded)
- return 1; //'Unknown Contact'
- if (pdnce && g_CluiData.bFilterEffective && !fEmbedded)
- {
+ if (pdnce && pdnce->isUnknown && !fEmbedded)
+ return 1; //'Unknown Contact'
+ if (pdnce && g_CluiData.bFilterEffective && !fEmbedded) {
if (szProto == NULL)
szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
// check stickies first (priority), only if we really have stickies defined (CLVM_STICKY_CONTACTS is set).
- if (g_CluiData.bFilterEffective & CLVM_STICKY_CONTACTS)
- {
+ if (g_CluiData.bFilterEffective & CLVM_STICKY_CONTACTS) {
if ((dwLocalMask = db_get_dw(hContact, CLVM_MODULE, g_CluiData.current_viewmode, 0)) != 0) {
- if (g_CluiData.bFilterEffective & CLVM_FILTER_STICKYSTATUS)
- {
+ if (g_CluiData.bFilterEffective & CLVM_FILTER_STICKYSTATUS) {
WORD wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
return !((1 << (wStatus - ID_STATUS_OFFLINE)) & HIWORD(dwLocalMask));
}
@@ -804,12 +801,10 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, struc WORD wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
filterResult = (g_CluiData.filterFlags & CLVM_GROUPSTATUS_OP) ? ((filterResult | ((1 << (wStatus - ID_STATUS_OFFLINE)) & g_CluiData.statusMaskFilter ? 1 : 0))) : (filterResult & ((1 << (wStatus - ID_STATUS_OFFLINE)) & g_CluiData.statusMaskFilter ? 1 : 0));
}
- if (g_CluiData.bFilterEffective & CLVM_FILTER_LASTMSG)
- {
+ if (g_CluiData.bFilterEffective & CLVM_FILTER_LASTMSG) {
DWORD now;
PDNCE pdnce = (PDNCE)pcli->pfnGetCacheEntry(hContact);
- if (pdnce)
- {
+ if (pdnce) {
now = g_CluiData.t_now;
now -= g_CluiData.lastMsgFilter;
if (g_CluiData.bFilterEffective & CLVM_FILTER_LASTMSG_OLDERTHAN)
|