From ea68d4474bb7329a5e59e0388b88155b96f31f7c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 1 Jun 2016 09:11:39 +0000 Subject: - view modes support incorporated into the CLIST_INTERFACE; - fix for the broken search by protocols in clist_nicer; - numerous Unicode fixes in clist_nicer; git-svn-id: http://svn.miranda-ng.org/main/trunk@16893 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_nicer/src/clcitems.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/Clist_nicer/src/clcitems.cpp') diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index 452fc2863d..a015a15740 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -373,7 +373,7 @@ void LoadSkinItemToCache(TExtraCache *cEntry) * also cares about sub contacts (if meta is active) */ -int __fastcall CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, struct ClcData *dat) +int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, struct ClcData *dat) { int dbHidden = db_get_b(hContact, "CList", "Hidden", 0); // default hidden state, always respect it. @@ -410,8 +410,9 @@ int __fastcall CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, str ptrT tszGroup(db_get_tsa(hContact, "CList", "Group")); if (tszGroup != NULL) { TCHAR szGroupMask[256]; - mir_sntprintf(szGroupMask, _T("%s|"), LPTSTR(tszGroup)+1); - filterResult = (cfg::dat.filterFlags & CLVM_PROTOGROUP_OP) ? (filterResult | (_tcsstr(cfg::dat.groupFilter, szGroupMask) ? 1 : 0)) : (filterResult & (_tcsstr(cfg::dat.groupFilter, szGroupMask) ? 1 : 0)); + mir_sntprintf(szGroupMask, _T("%s|"), tszGroup); + int bHasGroup = _tcsstr(cfg::dat.groupFilter, szGroupMask) ? 1 : 0; + filterResult = (cfg::dat.filterFlags & CLVM_PROTOGROUP_OP) ? (filterResult | bHasGroup) : (filterResult & bHasGroup); } else if (cfg::dat.filterFlags & CLVM_INCLUDED_UNGROUPED) filterResult = (cfg::dat.filterFlags & CLVM_PROTOGROUP_OP) ? filterResult : filterResult & 1; -- cgit v1.2.3