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 --- src/core/stdmsg/src/msgs.cpp | 4 ++-- src/mir_app/src/chat_tools.cpp | 2 +- src/mir_app/src/db_events.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 6e7e0f2ceb..57ed8bcc9b 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -134,7 +134,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM hDbEvent) if (!dbei) return 0; - if (dbei.markedRead() || !DbEventIsShown(dbei)) + if (dbei.bRead || !DbEventIsShown(dbei)) return 0; Utils_InvokeAsync(new CAutoPopup(hContact, hDbEvent)); @@ -290,7 +290,7 @@ static void RestoreUnreadMessageAlerts(void) if (!dbei) continue; - if (!dbei.markedRead() && DbEventIsShown(dbei)) { + if (!dbei.bRead && DbEventIsShown(dbei)) { int windowAlreadyExists = Srmm_FindWindow(hContact) != nullptr; if (windowAlreadyExists) continue; diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp index 64ab073211..ca602cda67 100644 --- a/src/mir_app/src/chat_tools.cpp +++ b/src/mir_app/src/chat_tools.cpp @@ -693,7 +693,7 @@ void Chat_EventToGC(SESSION_INFO *si, MEVENT hDbEvent) GCEVENT gce = { si, GC_EVENT_MESSAGE }; gce.dwFlags = GCEF_ADDTOLOG; - if (dbei.markedRead()) + if (dbei.bRead) gce.dwFlags |= GCEF_NOTNOTIFY; Utf2T wszUserId(dbei.szUserId); diff --git a/src/mir_app/src/db_events.cpp b/src/mir_app/src/db_events.cpp index ac3c9085cb..923724ab91 100644 --- a/src/mir_app/src/db_events.cpp +++ b/src/mir_app/src/db_events.cpp @@ -194,7 +194,7 @@ void DB::EventInfo::wipeNotify() if (!m_bValid) return; - if (!markedRead()) + if (!bRead) db_event_markRead(hContact, m_hEvent); Clist_RemoveEvent(-1, m_hEvent); } -- cgit v1.2.3