From e441a31e9f912fc8e9244d16560565559b1924d2 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 27 Sep 2019 23:43:06 +0300
Subject: end of manual experiments with CList/NotOnList

---
 plugins/Scriver/src/msgdialog.cpp | 4 ++--
 plugins/Scriver/src/msgutils.cpp  | 2 +-
 plugins/Scriver/src/utils.cpp     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/Scriver/src')

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 10e5c954f9..82a13c15ba 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -470,7 +470,7 @@ void CMsgDialog::OnDestroy()
 	if (m_hContact && g_dat.flags.bDelTemp) {
 		m_hContact = INVALID_CONTACT_ID; // to prevent recursion
 
-		if (db_get_b(m_hContact, "CList", "NotOnList", 0))
+		if (!Contact_OnList(m_hContact))
 			db_delete_contact(m_hContact);
 	}
 
@@ -632,7 +632,7 @@ void CMsgDialog::onClick_Add(CCtrlButton*)
 {
 	Contact_Add(m_hContact, m_hwnd);
 
-	if (!db_get_b(m_hContact, "CList", "NotOnList", 0))
+	if (Contact_OnList(m_hContact))
 		ShowWindow(GetDlgItem(m_hwnd, IDC_ADD), SW_HIDE);
 }
 
diff --git a/plugins/Scriver/src/msgutils.cpp b/plugins/Scriver/src/msgutils.cpp
index 34bde9dbdc..71fea672d6 100644
--- a/plugins/Scriver/src/msgutils.cpp
+++ b/plugins/Scriver/src/msgutils.cpp
@@ -123,7 +123,7 @@ bool CMsgDialog::IsTypingNotificationEnabled()
 	if (protoCaps & PF1_INVISLIST && protoStatus == ID_STATUS_INVISIBLE && db_get_w(m_hContact, m_szProto, "ApparentMode", 0) != ID_STATUS_ONLINE)
 		return FALSE;
 
-	if (db_get_b(m_hContact, "CList", "NotOnList", 0) && !g_plugin.bTypingUnknown)
+	if (!Contact_OnList(m_hContact) && !g_plugin.bTypingUnknown)
 		return FALSE;
 	return TRUE;
 }
diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp
index 4d80e51e98..c3bb35d3f2 100644
--- a/plugins/Scriver/src/utils.cpp
+++ b/plugins/Scriver/src/utils.cpp
@@ -296,7 +296,7 @@ void SetButtonsPos(HWND hwndDlg, MCONTACT hContact, bool bShow)
 			continue;
 
 		if (cbd->m_dwButtonCID == IDC_ADD)
-			if (!db_get_b(hContact, "CList", "NotOnList", 0)) {
+			if (Contact_OnList(hContact)) {
 				ShowWindow(hwndButton, SW_HIDE);
 				continue;
 			}
-- 
cgit v1.2.3