From 15c49e3fc4cf033fffbf79e9f68a0405d5a95d14 Mon Sep 17 00:00:00 2001 From: George Hazan 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/MirFox/src/MirfoxData.cpp | 3 ++- plugins/MirFox/src/MirfoxMiranda.cpp | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/MirFox/src') 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); -- cgit v1.2.3