Clist_IsHidden / Clist_HideContact - two helpers to hide CList/Hidden variable and unify access to it

31 files changed, 61 insertions, 65 deletions

diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp
index 1411ecffb3..93ef446f50 100644
--- a/plugins/AVS/src/options.cpp
+++ b/plugins/AVS/src/options.cpp
@@ -496,7 +496,7 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 		ShowWindow(hwndDlg, SW_SHOWNORMAL);
 		InvalidateRect(GetDlgItem(hwndDlg, IDC_PROTOPIC), nullptr, FALSE);
 		CheckDlgButton(hwndDlg, IDC_PROTECTAVATAR, db_get_b(hContact, "ContactPhoto", "Locked", 0) ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_HIDEAVATAR, db_get_b(hContact, "ContactPhoto", "Hidden", 0) ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_HIDEAVATAR, Clist_IsHidden(hContact) ? BST_CHECKED : BST_UNCHECKED);
 
 		SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_BKG_NUM_POINTS), 0);
 		SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETRANGE, 0, MAKELONG(8, 2));
@@ -525,11 +525,11 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 
 		case IDOK:
 			{
-				BOOL locked = IsDlgButtonChecked(hwndDlg, IDC_PROTECTAVATAR);
-				int hidden = IsDlgButtonChecked(hwndDlg, IDC_HIDEAVATAR) ? 1 : 0;
+				bool locked = IsDlgButtonChecked(hwndDlg, IDC_PROTECTAVATAR) != 0;
+				bool hidden = IsDlgButtonChecked(hwndDlg, IDC_HIDEAVATAR) != 0;
 				SetAvatarAttribute(hContact, AVS_HIDEONCLIST, hidden);
-				if (hidden != db_get_b(hContact, "ContactPhoto", "Hidden", 0))
-					db_set_b(hContact, "ContactPhoto", "Hidden", hidden);
+				if (hidden != Clist_IsHidden(hContact))
+					Clist_HideContact(hContact, hidden);
 
 				if (!locked && db_get_b(hContact, "ContactPhoto", "NeedUpdate", 0))
 					QueueAdd(hContact);
@@ -750,7 +750,7 @@ static INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wPa
 		TranslateDialogDefault(hwndDlg);
 		SendMessage(hwndDlg, DM_SETAVATARNAME, 0, 0);
 		CheckDlgButton(hwndDlg, IDC_PROTECTAVATAR, db_get_b(hContact, "ContactPhoto", "Locked", 0) ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_HIDEAVATAR, db_get_b(hContact, "ContactPhoto", "Hidden", 0) ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_HIDEAVATAR, Clist_IsHidden(hContact) ? BST_CHECKED : BST_UNCHECKED);
 
 		SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_BKG_NUM_POINTS), 0);
 		SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETRANGE, 0, MAKELONG(8, 2));
@@ -783,10 +783,10 @@ static INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wPa
 
 		case IDC_HIDEAVATAR:
 			{
-				int hidden = IsDlgButtonChecked(hwndDlg, IDC_HIDEAVATAR) ? 1 : 0;
+				bool hidden = IsDlgButtonChecked(hwndDlg, IDC_HIDEAVATAR) != 0;
 				SetAvatarAttribute(hContact, AVS_HIDEONCLIST, hidden);
-				if (hidden != db_get_b(hContact, "ContactPhoto", "Hidden", 0))
-					db_set_b(hContact, "ContactPhoto", "Hidden", hidden);
+				if (hidden != Clist_IsHidden(hContact))
+					Clist_HideContact(hContact, hidden);
 			}
 			break;
 
diff --git a/plugins/AVS/src/utils.cpp b/plugins/AVS/src/utils.cpp
index cea5beb71e..80b8add728 100644
--- a/plugins/AVS/src/utils.cpp
+++ b/plugins/AVS/src/utils.cpp
@@ -158,7 +158,7 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz
 	GetObject(ace->hbmPic, sizeof(bminfo), &bminfo);

 

 	ace->dwFlags = AVS_BITMAP_VALID;

-	if (hContact != NULL && db_get_b(hContact, "ContactPhoto", "Hidden", 0))

+	if (hContact != NULL && Clist_IsHidden(hContact))

 		ace->dwFlags |= AVS_HIDEONCLIST;

 	ace->hContact = hContact;

 	ace->bmHeight = bminfo.bmHeight;

diff --git a/plugins/AutoShutdown/src/watcher.cpp b/plugins/AutoShutdown/src/watcher.cpp
index fe08ea17a2..87cba96fde 100644
--- a/plugins/AutoShutdown/src/watcher.cpp
+++ b/plugins/AutoShutdown/src/watcher.cpp
@@ -182,7 +182,7 @@ static BOOL CheckAllContactsOffline(void)
 			if (db_get_b(hContact, pszProto, "ChatRoom", 0)) continue;

 			if (db_get_w(hContact, pszProto, "Status", 0) != ID_STATUS_OFFLINE) {

 				if (fSmartCheck) {

-					if (db_get_b(hContact, "CList", "Hidden", 0)) continue;

+					if (Clist_IsHidden(hContact)) continue;

 					if (db_get_b(hContact, "CList", "NotOnList", 0)) continue;

 				}

 				fAllOffline = FALSE;

diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
index 48649fcc95..82dd5204fb 100644
--- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp
+++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
@@ -100,7 +100,7 @@ LRESULT CALLBACK HidePopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 	switch (message) {

 	case WM_COMMAND:

 		if (HIWORD(wParam) == STN_CLICKED) {

-			db_set_b(PUGetContact(hWnd), "CList", "Hidden", 1);

+			Clist_HideContact(PUGetContact(hWnd));

 			PUDeletePopup(hWnd);

 		}

 		break;

@@ -112,7 +112,7 @@ LRESULT CALLBACK HidePopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 

 	case UM_POPUPACTION:

 		if (wParam == 2) {

-			db_set_b(PUGetContact(hWnd), "CList", "Hidden", 1);

+			Clist_HideContact(PUGetContact(hWnd));

 			PUDeletePopup(hWnd);

 		}

 		if (wParam == 3) {

@@ -223,7 +223,7 @@ bool isContactGoneFor(MCONTACT hContact, int days)
 

 	if (options.hideInactive)

 		if (daysSinceMessage >= options.iSilencePeriod)

-			if (!db_get_b(hContact, "CList", "Hidden", 0) && !g_plugin.getByte(hContact, "NeverHide", 0)) {

+			if (!Clist_IsHidden(hContact) && !g_plugin.getByte(hContact, "NeverHide", 0)) {

 				POPUPDATAW ppd;

 				ppd.lchContact = hContact;

 				ppd.lchIcon = IcoLib_GetIcon("enabled_icon");

@@ -252,7 +252,7 @@ bool isContactGoneFor(MCONTACT hContact, int days)
 

 void ReturnNotify(MCONTACT hContact, wchar_t *message)

 {

-	if (db_get_b(hContact, "CList", "NotOnList", 0) == 1 || db_get_b(hContact, "CList", "Hidden", 0) == 1)

+	if (db_get_b(hContact, "CList", "NotOnList", 0) == 1 || Clist_IsHidden(hContact))

 		return;

 

 	Skin_PlaySound("buddyExpectatorReturn");

@@ -291,7 +291,7 @@ void ReturnNotify(MCONTACT hContact, wchar_t *message)
 

 void GoneNotify(MCONTACT hContact, wchar_t *message)

 {

-	if (db_get_b(hContact, "CList", "NotOnList", 0) == 1 || db_get_b(hContact, "CList", "Hidden", 0) == 1)

+	if (db_get_b(hContact, "CList", "NotOnList", 0) == 1 || Clist_IsHidden(hContact))

 		return;

 

 	if (options.iShowPopup2 > 0) {

diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index 97eff14c37..7cbd225163 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -212,7 +212,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 	if (!hContactOrMeta)

 		hContactOrMeta = hContact;

 

-	if (hContact && db_get_b(hContactOrMeta, "CList", "Hidden", 0))

+	if (hContact && Clist_IsHidden(hContactOrMeta))

 		return 0;

 

 	int PerContactSetting = hContact ? g_plugin.getByte(hContact, DB_CCN_NOTIFY, NOTIFY_USEGLOBAL) : NOTIFY_ALWAYS; // NOTIFY_ALWAYS for preview

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index e59f10c3fe..a9afcacfd1 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1308,7 +1308,7 @@ static LRESULT clcOnIntmGroupChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wPara
 		flags = contact->flags;

 	}

 	Clist_DeleteItemFromTree(hwnd, wParam);

-	if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !g_plugin.getByte(wParam, "Hidden")) {

+	if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !Clist_IsHidden(wParam)) {

 		NMCLISTCONTROL nm;

 		g_clistApi.pfnAddContactToTree(hwnd, dat, wParam, 1, 1);

 		if (Clist_FindItem(hwnd, dat, wParam, &contact)) {

diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp
index d9e9c35246..87a0c84cd1 100644
--- a/plugins/Clist_modern/src/modern_clcitems.cpp
+++ b/plugins/Clist_modern/src/modern_clcitems.cpp
@@ -326,7 +326,7 @@ ClcCacheEntry* cliCreateCacheItem(MCONTACT hContact)
 

 	pdnce->hContact = hContact;

 	pdnce->szProto = GetContactProto(hContact);

-	pdnce->bIsHidden = g_plugin.getByte(hContact, "Hidden");

+	pdnce->bIsHidden = Clist_IsHidden(hContact);

 	pdnce->m_bIsSub = db_mc_isSub(hContact) != 0;

 	pdnce->m_bNoHiddenOffline = g_plugin.getByte(hContact, "noOffline");

 	pdnce->IdleTS = db_get_dw(hContact, pdnce->szProto, "IdleTS", 0);

@@ -396,7 +396,7 @@ int cliGetGroupContentsCount(ClcGroup *group, int visibleOnly)
 

 int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, ClcData *dat)

 {

-	int dbHidden = g_plugin.getByte(hContact, "Hidden"); // default hidden state, always respect it.

+	int dbHidden = Clist_IsHidden(hContact); // default hidden state, always respect it.

 	int filterResult = 1;

 	int searchResult = 0;

 	ClcCacheEntry *pdnce = Clist_GetCacheEntry(hContact);

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index bb843b5bbe..fe8faf6126 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -131,7 +131,7 @@ static int ClcSettingChanged(WPARAM hContact, LPARAM lParam)
 			if (!__strcmp(szProto, cws->szModule)) {

 				// was a unique setting key written?

 				if (!__strcmp(cws->szSetting, "Status")) {

-					if (!g_plugin.getByte(hContact, "Hidden"))

+					if (!Clist_IsHidden(hContact))

 						if (cws->value.wVal == ID_STATUS_OFFLINE)

 							if (g_plugin.getByte("HideOffline", SETTING_HIDEOFFLINE_DEFAULT))

 								return 0;

diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index 023ba9a40d..283691b06a 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -373,7 +373,7 @@ void LoadSkinItemToCache(TExtraCache *cEntry)
 

 int CLVM_GetContactHiddenStatus(MCONTACT hContact, char *szProto, struct ClcData *dat)

 {

-	int dbHidden = g_plugin.getByte(hContact, "Hidden"); // default hidden state, always respect it.

+	int dbHidden = Clist_IsHidden(hContact); // default hidden state, always respect it.

 

 	// always hide subcontacts (but show them on embedded contact lists)

 	if (dat != nullptr && dat->bHideSubcontacts && cfg::dat.bMetaEnabled && db_mc_isSub(hContact))

diff --git a/plugins/KeyboardNotify/src/ignore.cpp b/plugins/KeyboardNotify/src/ignore.cpp
index fd9808108c..9d2c57df76 100644
--- a/plugins/KeyboardNotify/src/ignore.cpp
+++ b/plugins/KeyboardNotify/src/ignore.cpp
@@ -32,7 +32,7 @@ static DWORD GetMask(MCONTACT hContact)
 		if(hContact == NULL)

 			mask=0;

 		else {

-			if(db_get_b(hContact, "CList", "Hidden", 0) || db_get_b(hContact, "CList", "NotOnList", 0))

+			if (Clist_IsHidden(hContact) || db_get_b(hContact, "CList", "NotOnList", 0))

 				mask = g_plugin.getDword("Mask1", 0);

 			else

 				mask = g_plugin.getDword("Default1", 0);

diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 5a1c87ab99..a8c8a6f3c5 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -377,7 +377,7 @@ static INT_PTR onSetVis(WPARAM wparam, LPARAM)
 static INT_PTR onHide(WPARAM wparam, LPARAM)

 {

 	MCONTACT hContact = (MCONTACT)wparam;

-	db_set_b(hContact, "CList", "Hidden", (BYTE)!db_get_b(hContact, "CList", "Hidden", 0));

+	Clist_HideContact(hContact, !Clist_IsHidden(hContact));

 	return 0;

 }

 

@@ -643,7 +643,7 @@ static int isIgnored(MCONTACT hContact, int type)
 static INT_PTR onIgnore(WPARAM wparam, LPARAM lparam)

 {

 	if (g_plugin.getByte("ignorehide", 0) && (lparam == IGNOREEVENT_ALL))

-		db_set_b((MCONTACT)wparam, "CList", "Hidden", (isIgnored((MCONTACT)wparam, lparam) ? (byte)0 : (byte)1));

+		Clist_HideContact(wparam, !isIgnored((MCONTACT)wparam, lparam));

 

 	CallService(isIgnored((MCONTACT)wparam, lparam) ? MS_IGNORE_UNIGNORE : MS_IGNORE_IGNORE, wparam, lparam);

 	return 0;

@@ -693,8 +693,7 @@ static int BuildMenu(WPARAM wparam, LPARAM)
 	bEnabled = bShowAll || (flags & VF_HFL);

 	Menu_ShowItem(hmenuHide, bEnabled);

 	if (bEnabled) {

-		BYTE bHidden = db_get_b(hContact, "CList", "Hidden", 0);

-		if (bHidden)

+		if (Clist_IsHidden(hContact))

 			Menu_ModifyItem(hmenuHide, LPGENW("Show in list"), IcoLib_GetIconHandle("miex_showil"));

 		else

 			Menu_ModifyItem(hmenuHide, LPGENW("Hide from list"), IcoLib_GetIconHandle("miex_hidefl"));

diff --git a/plugins/MirFox/src/MirfoxData.cpp b/plugins/MirFox/src/MirfoxData.cpp
index 5aa4034d45..ac402cfab0 100644
--- a/plugins/MirFox/src/MirfoxData.cpp
+++ b/plugins/MirFox/src/MirfoxData.cpp
@@ -616,7 +616,8 @@ void MirfoxData::initializeMirandaContacts()
 	for (auto &hContact : Contacts()){

 

 		//"Hidden" contacts not allowed in MirfoxData and SM, "NotOnList" contacts allowed and enabled

-		if (db_get_b(hContact, "CList", "Hidden", 0) == 1) continue;

+		if (Clist_IsHidden(hContact))

+			continue;

 

 		//add to MirfoxData list

 		MirandaContact* mirandaContactItemPtr = new MirandaContact(

diff --git a/plugins/MirFox/src/MirfoxMiranda.cpp b/plugins/MirFox/src/MirfoxMiranda.cpp
index e855537f5b..015fecfc7f 100644
--- a/plugins/MirFox/src/MirfoxMiranda.cpp
+++ b/plugins/MirFox/src/MirfoxMiranda.cpp
@@ -127,7 +127,7 @@ void CMirfoxMiranda::onContactAdded_async(void* threadArg)
 		canAdd = false;

 

 	// execute

-	if (canAdd && db_get_b(onContactAsyncThreadArgStruct->hContact, "CList", "Hidden", 0) == 1)

+	if (canAdd && Clist_IsHidden(onContactAsyncThreadArgStruct->hContact))

 		canAdd = false;

 

 	// add

@@ -188,10 +188,9 @@ void CMirfoxMiranda::onContactSettingChanged_async(void* threadArg){
 		canAdd = false;

 

 	// edit

-	if (canAdd &&db_get_b(onContactAsyncThreadArgStruct->hContact, "CList", "Hidden", 0) == 1)

+	if (canAdd && Clist_IsHidden(onContactAsyncThreadArgStruct->hContact))

 		canAdd = false;

 

-

 	if (canAdd)

 		mirfoxMiranda->getMirfoxData().refreshContact_Edit(mirfoxMiranda->getSharedMemoryUtils(), onContactAsyncThreadArgStruct->hContact);

 

diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp
index 602fec49f4..1942853761 100644
--- a/plugins/MirandaG15/src/CAppletManager.cpp
+++ b/plugins/MirandaG15/src/CAppletManager.cpp
@@ -1123,7 +1123,7 @@ int CAppletManager::HookChatInbound(WPARAM, LPARAM lParam)
 		Event.hContact = NULL;
 
 	// Ignore events from hidden chatrooms, except for join events
-	if (gce->pszID.w != nullptr && db_get_b(Event.hContact, "CList", "Hidden", 0)) {
+	if (gce->pszID.w != nullptr && Clist_IsHidden(Event.hContact)) {
 		if (gce->iType == GC_EVENT_JOIN && pHistory)
 			pHistory->LUsers.push_back(toTstring(gce->pszNick.w));
 
@@ -1645,7 +1645,7 @@ int CAppletManager::HookSettingChanged(WPARAM hContact, LPARAM lParam)
 	else if (!strcmp(dbcws->szModule, "CList")) {
 		if (!strcmp(dbcws->szSetting, "Hidden")) {
 			Event.eType = EVENT_CONTACT_HIDDEN;
-			Event.iValue = db_get_b(hContact, "CList", "Hidden", 0);
+			Event.iValue = Clist_IsHidden(hContact);
 		}
 		else if (!strcmp(dbcws->szSetting, "Group")) {
 			Event.eType = EVENT_CONTACT_GROUP;
diff --git a/plugins/MirandaG15/src/CContactList.cpp b/plugins/MirandaG15/src/CContactList.cpp
index c385b7965b..1331ef94e9 100644
--- a/plugins/MirandaG15/src/CContactList.cpp
+++ b/plugins/MirandaG15/src/CContactList.cpp
@@ -202,12 +202,12 @@ bool CContactList::IsVisible(CContactListEntry *pEntry)
 		return true;

 

 	if (CConfig::GetBoolSetting(CLIST_USEIGNORE)) {

-		if (db_get_b(pEntry->hHandle, "CList", "Hidden", 0))

+		if (Clist_IsHidden(pEntry->hHandle))

 			return false;

 

 		if (db_mc_isSub(pEntry->hHandle)) {

 			MCONTACT hMetaContact = db_mc_getMeta(pEntry->hHandle);

-			if (db_get_b(hMetaContact, "CList", "Hidden", 0))

+			if (Clist_IsHidden(hMetaContact))

 				return false;

 		}

 	}

diff --git a/plugins/MirandaG15/src/CEventScreen.cpp b/plugins/MirandaG15/src/CEventScreen.cpp
index 169a2caef9..c307a5715b 100644
--- a/plugins/MirandaG15/src/CEventScreen.cpp
+++ b/plugins/MirandaG15/src/CEventScreen.cpp
@@ -186,8 +186,7 @@ void CEventScreen::OnLCDButtonDown(int iButton)
 		char *szProto = GetContactProto(pEntry->hContact);

 		CIRCConnection *pIRCCon = CAppletManager::GetInstance()->GetIRCConnection(toTstring(szProto));

 

-		if (pIRCCon && db_get_b(pEntry->hContact, szProto, "ChatRoom", 0) != 0 &&

-			db_get_b(pEntry->hContact, "CList", "Hidden", 0))

+		if (pIRCCon && db_get_b(pEntry->hContact, szProto, "ChatRoom", 0) != 0 && Clist_IsHidden(pEntry->hContact))

 			return;

 

 		CAppletManager::GetInstance()->ActivateChatScreen(pEntry->hContact);

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index 559517ec96..f89d1bb017 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -262,7 +262,7 @@ wchar_t* GetStr(STATUSMSGINFO *n, const wchar_t *tmplt)
 

 bool SkipHiddenContact(MCONTACT hContact)

 {

-	return (!opt.HiddenContactsToo && (db_get_b(hContact, "CList", "Hidden", 0) == 1));

+	return (!opt.HiddenContactsToo && Clist_IsHidden(hContact));

 }

 

 void LogSMsgToDB(STATUSMSGINFO *smi, const wchar_t *tmplt)

diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index 944dddf5fd..58c30723a1 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -350,7 +350,7 @@ void ExtraStatusChanged(XSTATUSCHANGE *xsc)
 	mir_snprintf(buff, "%d", ID_STATUS_EXTRASTATUS);

 	if ((g_plugin.getByte(buff, 1) == 0)

 		|| (db_get_w(xsc->hContact, xsc->szProto, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE)

-		|| (!opt.HiddenContactsToo && (db_get_b(xsc->hContact, "CList", "Hidden", 0) == 1))

+		|| (!opt.HiddenContactsToo && Clist_IsHidden(xsc->hContact))

 		|| (Proto_GetStatus(xsc->szProto) == ID_STATUS_OFFLINE))

 	{

 		FreeXSC(xsc);

diff --git a/plugins/SecureIM/src/crypt_check.cpp b/plugins/SecureIM/src/crypt_check.cpp
index 0b9242d9e2..fb9c691e6b 100644
--- a/plugins/SecureIM/src/crypt_check.cpp
+++ b/plugins/SecureIM/src/crypt_check.cpp
@@ -96,7 +96,7 @@ bool isProtoSmallPackets(MCONTACT hContact)
 

 bool isContactInvisible(MCONTACT hContact)

 {

-	if (!db_mc_isSub(hContact) && db_get_b(hContact, "CList", "Hidden", 0))

+	if (!db_mc_isSub(hContact) && Clist_IsHidden(hContact))

 		return true;

 

 	pUinKey p = findUinKey(hContact);

diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp
index 0364a99da1..0bb0111924 100644
--- a/plugins/SeenPlugin/src/utils.cpp
+++ b/plugins/SeenPlugin/src/utils.cpp
@@ -439,7 +439,7 @@ void ShowPopup(MCONTACT hcontact, const char * lpzProto, int newStatus)
 	if (CallService(MS_IGNORE_ISIGNORED, (WPARAM)hcontact, IGNOREEVENT_USERONLINE))

 		return;

 

-	if (!g_plugin.getByte("UsePopups", 0) || !db_get_b(hcontact, "CList", "Hidden", 0))

+	if (!g_plugin.getByte("UsePopups", 0) || !Clist_IsHidden(hcontact))

 		return;

 

 	DBVARIANT dbv;

diff --git a/plugins/Sessions/Src/Utils.cpp b/plugins/Sessions/Src/Utils.cpp
index 67a9750877..e19a4f87ab 100644
--- a/plugins/Sessions/Src/Utils.cpp
+++ b/plugins/Sessions/Src/Utils.cpp
@@ -289,7 +289,7 @@ void OffsetWindow(HWND parent, HWND hwnd, int dx, int dy)
 

 int CheckContactVisibility(MCONTACT hContact)

 {

-	return db_mc_isSub(hContact) || !db_get_b(hContact, "CList", "Hidden", 0);

+	return db_mc_isSub(hContact) || !Clist_IsHidden(hContact);

 }

 

 void RenameUserDefSession(int ses_count, wchar_t* ptszNewName)

diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp
index 3b13388e9f..a71875bfa4 100644
--- a/plugins/ShellExt/src/shlcom.cpp
+++ b/plugins/ShellExt/src/shlcom.cpp
@@ -271,10 +271,10 @@ bool ipcGetSortedContacts(THeaderIPC * ipch, int* pSlot, bool bGroupMode)
 

 			// is HIT on?

 			if (BST_UNCHECKED == g_plugin.getByte(SHLExt_UseHITContacts, BST_UNCHECKED)) {

-				// don't show people who are "Hidden" "NotOnList" or Ignored

-				if (db_get_b(hContact, "CList", "Hidden", 0) == 1 ||

-					db_get_b(hContact, "CList", "NotOnList", 0) == 1 ||

-					CallService(MS_IGNORE_ISIGNORED, hContact, IGNOREEVENT_MESSAGE | IGNOREEVENT_FILE) != 0)

+				// don't show people who are hidden, "NotOnList" or ignored

+				if (Clist_IsHidden(hContact) ||

+					 db_get_b(hContact, "CList", "NotOnList", 0) == 1 ||

+					 CallService(MS_IGNORE_ISIGNORED, hContact, IGNOREEVENT_MESSAGE | IGNOREEVENT_FILE) != 0)

 					continue;

 			}

 			// is HIT2 off?

diff --git a/plugins/Spamotron/src/spamotron.cpp b/plugins/Spamotron/src/spamotron.cpp
index f5632f6614..1e85e029a9 100644
--- a/plugins/Spamotron/src/spamotron.cpp
+++ b/plugins/Spamotron/src/spamotron.cpp
@@ -101,7 +101,7 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam)
 

 	// Hide the contact until verified if option set.

 	if (g_plugin.getByte("HideUnverified", defaultHideUnverified))

-		db_set_b(hContact, "CList", "Hidden", 1);

+		Clist_HideContact(hContact);

 

 	// Fetch the incoming message body

 	char *msgblob;

@@ -145,7 +145,7 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam)
 			if (bCorrectResponse) {

 				g_plugin.setByte(hContact, "Verified", 1);

 				if (g_plugin.getByte("HideUnverified", defaultHideUnverified))

-					db_unset(hContact, "CList", "Hidden");

+					Clist_HideContact(hContact, false);

 				if (g_plugin.getByte("AddPermanently", defaultAddPermanently))

 					db_unset(hContact, "CList", "NotOnList");

 				db_unset(hContact, "CList", "Delete");

@@ -210,7 +210,7 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam)
 	{

 		g_plugin.setByte(hContact, "Verified", 1);

 		if (g_plugin.getByte("HideUnverified", defaultHideUnverified))

-			db_unset(hContact, "CList", "Hidden");

+			Clist_HideContact(hContact, false);

 		if (g_plugin.getByte("AddPermanently", defaultAddPermanently))

 			db_unset(hContact, "CList", "NotOnList");

 		db_unset(hContact, "CList", "Delete");

@@ -313,7 +313,7 @@ int OnDBEventFilterAdd(WPARAM wParam, LPARAM lParam)
 			_notify(hContact, POPUP_APPROVED, TranslateT("Contact %s approved."), message);

 			g_plugin.setByte(hContact, "Verified", 1);

 			if (g_plugin.getByte("HideUnverified", defaultHideUnverified))

-				db_unset(hContact, "CList", "Hidden");

+				Clist_HideContact(hContact, false);

 			if (g_plugin.getByte("AddPermanently", defaultAddPermanently))

 				db_unset(hContact, "CList", "NotOnList");

 			db_unset(hContact, "CList", "Delete");

diff --git a/plugins/StopSpamMod/src/stopspam.cpp b/plugins/StopSpamMod/src/stopspam.cpp
index b3035150e4..6d0c8e937c 100755
--- a/plugins/StopSpamMod/src/stopspam.cpp
+++ b/plugins/StopSpamMod/src/stopspam.cpp
@@ -44,7 +44,7 @@ int OnDbEventAdded(WPARAM hContact, LPARAM hDbEvent)
 				// ...send message
 
 				if (gbHideContacts)
-					db_set_b(hcntct, "CList", "Hidden", 1);
+					Clist_HideContact(hcntct);
 				if (gbSpecialGroup)
 					Clist_SetGroup(hcntct, gbSpammersGroup.c_str());
 				BYTE msg = 1;
@@ -156,7 +156,7 @@ int OnDbEventFilterAdd(WPARAM hContact, LPARAM l)
 	
 	if (answered) {
 		// unhide contact
-		db_unset(hContact, "CList", "Hidden");
+		Clist_HideContact(hContact, false);
 
 		g_plugin.delSetting(hContact, "MathAnswer");
 
@@ -270,7 +270,7 @@ int OnDbEventFilterAdd(WPARAM hContact, LPARAM l)
 		}
 	}
 	if (gbHideContacts)
-		db_set_b(hContact, "CList", "Hidden", 1);
+		Clist_HideContact(hContact);
 	if (gbSpecialGroup)
 		Clist_SetGroup(hContact, gbSpammersGroup.c_str());
 	db_set_b(hContact, "CList", "NotOnList", 1);
diff --git a/plugins/StopSpamPlus/src/events.cpp b/plugins/StopSpamPlus/src/events.cpp
index ad96474d80..27c44c374b 100644
--- a/plugins/StopSpamPlus/src/events.cpp
+++ b/plugins/StopSpamPlus/src/events.cpp
@@ -34,7 +34,7 @@ int OnDbEventAdded(WPARAM, LPARAM lParam)
 			CallProtoService(dbei.szModule, PS_AUTHDENY, hDbEvent, (LPARAM)_T2A(variables_parse(g_sets.getReply(), hcntct).c_str()));

 

 			db_set_b(hcntct, "CList", "NotOnList", 1);

-			db_set_b(hcntct, "CList", "Hidden", 1);

+			Clist_HideContact(hcntct);

 			if (!g_sets.HistLog)

 				db_event_delete(0, hDbEvent);

 			return 1;

@@ -105,7 +105,7 @@ int OnDbEventFilterAdd(WPARAM w, LPARAM l)
 			// if message equal right answer...

 			if (g_sets.AnswNotCaseSens ? !mir_wstrcmpi(message.c_str(), answer.c_str()) : !mir_wstrcmp(message.c_str(), answer.c_str())) {

 				// unhide contact

-				db_unset(hContact, "CList", "Hidden");

+				Clist_HideContact(hContact, false);

 

 				// mark contact as Answered

 				g_plugin.setByte(hContact, DB_KEY_ANSWERED, 1);

@@ -147,7 +147,7 @@ int OnDbEventFilterAdd(WPARAM w, LPARAM l)
 

 	// hide contact from contact list

 	db_set_b(hContact, "CList", "NotOnList", 1);

-	db_set_b(hContact, "CList", "Hidden", 1);

+	Clist_HideContact(hContact);

 

 	// save message from contact

 	dbei->flags |= DBEF_READ;

diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp
index 79e173ec07..c92e11d842 100644
--- a/plugins/TabSRMM/src/chat_tools.cpp
+++ b/plugins/TabSRMM/src/chat_tools.cpp
@@ -309,8 +309,8 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
 	if (bHighlight) {

 		gce->iType |= GC_EVENT_HIGHLIGHT;

 		params->sound = "ChatHighlight";

-		if (db_get_b(si->hContact, "CList", "Hidden", 0) != 0)

-			db_unset(si->hContact, "CList", "Hidden");

+		if (Clist_IsHidden(si->hContact) != 0)

+			Clist_HideContact(si->hContact, false);

 		if (params->bInactive) {

 			bFlagUnread = true;

 			DoTrayIcon(si, gce);

diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index f9a92d12fb..2a4f630dbb 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -81,7 +81,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 void TN_TypingMessage(MCONTACT hContact, int iMode)

 {

 	// hidden & ignored contacts check

-	if (db_get_b(hContact, "CList", "Hidden", 0) || (db_get_dw(hContact, "Ignore", "Mask1", 0) & 1)) // 9 - online notification

+	if (Clist_IsHidden(hContact) || (db_get_dw(hContact, "Ignore", "Mask1", 0) & 1)) // 9 - online notification

 		return;

 

 	if (Disabled)

diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp
index efb801e967..1e2e724238 100644
--- a/plugins/TooltipNotify/src/TooltipNotify.cpp
+++ b/plugins/TooltipNotify/src/TooltipNotify.cpp
@@ -203,7 +203,7 @@ int CTooltipNotify::ContactSettingChanged(WPARAM hContact, LPARAM lParam)
 		idle = true;

 	else return 0;

 

-	if (db_get_b(hContact, "CList", "Hidden", 0))

+	if (Clist_IsHidden(hContact))

 		return 0;

 

 	const char *pszProto = cws->szModule;

diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp
index 93ec9fbad0..2ab71be4a1 100644
--- a/plugins/UserInfoEx/src/svc_reminder.cpp
+++ b/plugins/UserInfoEx/src/svc_reminder.cpp
@@ -523,7 +523,7 @@ static bool CheckBirthday(MCONTACT hContact, MTime &Now, CEvent &evt, BYTE bNoti
 static void CheckContact(MCONTACT hContact, MTime &Now, CEvent &evt, BYTE bNotify, PWORD LastAnwer = nullptr)

 {

 	// ignore meta subcontacts here as their birthday information are collected explicitly

-	if (hContact && (!gRemindOpts.bCheckVisibleOnly || !db_get_b(hContact, MOD_CLIST, "Hidden", FALSE)) && !db_mc_isSub(hContact)) {

+	if (hContact && (!gRemindOpts.bCheckVisibleOnly || !Clist_IsHidden(hContact)) && !db_mc_isSub(hContact)) {

 		CEvent ca;

 

 		if (CheckBirthday(hContact, Now, ca, bNotify, LastAnwer) || CheckAnniversaries(hContact, Now, ca, bNotify)) {

diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp
index 443794d9bd..638b6d31fd 100644
--- a/plugins/WhenWasIt/src/hooked_events.cpp
+++ b/plugins/WhenWasIt/src/hooked_events.cpp
@@ -91,7 +91,7 @@ int RefreshContactListIcons(MCONTACT hContact)
 	if (hContact == 0)

 		return 0;

 

-	int hidden = db_get_b(hContact, "CList", "Hidden", 0);

+	bool hidden = Clist_IsHidden(hContact);

 	int ignored = db_get_dw(hContact, "Ignore", "Mask1", 0);

 	ignored = ((ignored & 0x3f) != 0) ? 1 : 0;

 	int ok = 1;

diff --git a/plugins/wbOSD/src/events.cpp b/plugins/wbOSD/src/events.cpp
index a3b9346e88..925ad4e588 100644
--- a/plugins/wbOSD/src/events.cpp
+++ b/plugins/wbOSD/src/events.cpp
@@ -117,9 +117,7 @@ int ContactStatusChanged(WPARAM wParam, LPARAM lParam)
 

 	logmsg("ContactStatusChanged2");

 

-	if (db_get_b(hContact, "CList", "NotOnList", 0) || db_get_b(hContact, "CList", "Hidden", 0) ||

-		(CallService(MS_IGNORE_ISIGNORED, wParam, IGNOREEVENT_USERONLINE) && newStatus == ID_STATUS_ONLINE)

-		)

+	if (db_get_b(hContact, "CList", "NotOnList", 0) || Clist_IsHidden(hContact) || (CallService(MS_IGNORE_ISIGNORED, wParam, IGNOREEVENT_USERONLINE) && newStatus == ID_STATUS_ONLINE))

 		return 0;

 

 	wchar_t bufferW[512];