From 500dd4848842f6d4207584417448586d060fbd6a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 31 Jul 2022 18:07:27 +0300 Subject: Contact: group of functions gathered into the personal namespace --- plugins/NewXstatusNotify/src/main.cpp | 4 ++-- plugins/NewXstatusNotify/src/xstatus.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins/NewXstatusNotify/src') diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index bfef047802..f0317beacb 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 && Contact_IsHidden(hContact)); + return (!opt.HiddenContactsToo && Contact::IsHidden(hContact)); } void LogSMsgToDB(STATUSMSGINFO *smi, const wchar_t *tmplt) @@ -478,7 +478,7 @@ int ProcessStatus(DBCONTACTWRITESETTING *cws, MCONTACT hContact) return 0; // we don't want to be notified if new chatroom comes online - if (Contact_IsGroupChat(hContact, szProto)) + if (Contact::IsGroupChat(hContact, szProto)) return 0; uint16_t oldStatus = DBGetContactSettingRangedWord(hContact, "UserOnline", "LastStatus", ID_STATUS_OFFLINE, ID_STATUS_MIN, ID_STATUS_MAX); diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp index 72381c301d..7b32997456 100644 --- a/plugins/NewXstatusNotify/src/xstatus.cpp +++ b/plugins/NewXstatusNotify/src/xstatus.cpp @@ -344,7 +344,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 && Contact_IsHidden(xsc->hContact)) + || (!opt.HiddenContactsToo && Contact::IsHidden(xsc->hContact)) || (Proto_GetStatus(xsc->szProto) == ID_STATUS_OFFLINE)) { FreeXSC(xsc); -- cgit v1.2.3