From a5e4a0de5bfa544de0e77ce3bf5443386530d43f Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 10 Apr 2025 15:02:31 +0300 Subject: that was a very dirty crutch, let's remove it --- plugins/Scriver/src/msgs.cpp | 2 +- plugins/TabSRMM/src/globals.cpp | 2 +- plugins/TabSRMM/src/mim.cpp | 2 +- plugins/TabSRMM/src/msglog.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins') diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index ed86c8b0ce..298fe9c5b7 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -259,7 +259,7 @@ static void RestoreUnreadMessageAlerts(void) DB::EventInfo dbei(hDbEvent, false); if (!dbei) continue; - if (dbei.markedRead() || !dbei.isSrmm() || !Proto_GetBaseAccountName(hContact)) + if (dbei.bRead || !dbei.isSrmm() || !Proto_GetBaseAccountName(hContact)) continue; int windowAlreadyExists = Srmm_FindWindow(hContact) != nullptr; diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index a6ab43374d..fe05abd507 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -457,7 +457,7 @@ void CGlobals::RestoreUnreadMessageAlerts(void) if (!dbei) continue; - if (!dbei.markedRead() && dbei.isAlertable()) + if (!dbei.bRead && dbei.isAlertable()) if (!Srmm_FindWindow(hContact)) events.insert(new MSavedEvent(hContact, hDbEvent)); } diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index fb54eab03f..e89605ae1d 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -376,7 +376,7 @@ int CMimAPI::MessageEventAdded(WPARAM hContact, LPARAM hDbEvent) DB::EventInfo dbei(hDbEvent); BOOL isCustomEvent = IsCustomEvent(dbei.eventType); bool isShownCustomEvent = dbei.isSrmm(); - if (dbei.markedRead() || (isCustomEvent && !isShownCustomEvent)) + if (dbei.bRead || (isCustomEvent && !isShownCustomEvent)) return 0; bool bAutoPopup = g_plugin.bAutoPopup; diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp index 1c0085df3f..1eb2d12c4b 100644 --- a/plugins/TabSRMM/src/msglog.cpp +++ b/plugins/TabSRMM/src/msglog.cpp @@ -565,7 +565,7 @@ bool CLogWindow::CreateRtfEvent(RtfLogStreamData *streamData, DB::EventInfo &dbe bool isBold = false, isItalic = false, isUnderline = false; auto *dat = &m_pDlg; - if (dbei.eventType == EVENTTYPE_MESSAGE && !dbei.markedRead()) + if (dbei.eventType == EVENTTYPE_MESSAGE && !dbei.bRead) dat->m_cache->updateStats(TSessionStats::SET_LAST_RCV, mir_strlen((char *)dbei.pBlob)); bool isSent = dbei.bSent; @@ -596,7 +596,7 @@ bool CLogWindow::CreateRtfEvent(RtfLogStreamData *streamData, DB::EventInfo &dbe uint32_t dwEffectiveFlags = dat->m_dwFlags; - dat->m_bIsHistory = (dbei.getUnixtime() < dat->m_cache->getSessionStart() && dbei.markedRead()); + dat->m_bIsHistory = (dbei.getUnixtime() < dat->m_cache->getSessionStart() && dbei.bRead); int iFontIDOffset = dat->m_bIsHistory ? 8 : 0; // offset into the font table for either history (old) or new events... (# of fonts per configuration set) g_groupBreak = TRUE; -- cgit v1.2.3