From 15c49e3fc4cf033fffbf79e9f68a0405d5a95d14 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 26 Sep 2019 22:15:57 +0300
Subject: Clist_IsHidden / Clist_HideContact - two helpers to hide CList/Hidden
 variable and unify access to it

---
 plugins/NewXstatusNotify/src/main.cpp    | 2 +-
 plugins/NewXstatusNotify/src/xstatus.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/NewXstatusNotify')

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);
-- 
cgit v1.2.3