From 64b53b1c28ffa353ff2f0c0a01405f9afc2b7bf1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 14 Oct 2024 16:43:53 +0300
Subject: common group chat code moved to mir_app

---
 plugins/Scriver/src/msgdialog.cpp   | 17 ++---------------
 plugins/TabSRMM/src/chat_tools.cpp  |  3 +--
 plugins/TabSRMM/src/msgdialog.cpp   |  4 +---
 plugins/TabSRMM/src/msgdlgother.cpp |  5 +----
 4 files changed, 5 insertions(+), 24 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 602aeaeb0e..2477dcbfa6 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -855,17 +855,7 @@ INT_PTR CMsgDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 
 	case DM_ACTIVATE:
 		if (isChat()) {
-			if (m_si->wState & STATE_TALK) {
-				m_si->wState &= ~STATE_TALK;
-				db_unset(m_hContact, m_si->pszModule, "ApparentMode");
-			}
-
-			if (m_si->wState & GC_EVENT_HIGHLIGHT) {
-				m_si->wState &= ~GC_EVENT_HIGHLIGHT;
-
-				if (Clist_GetEvent(m_hContact, 0))
-					Clist_RemoveEvent(m_hContact, GC_FAKE_EVENT);
-			}
+			m_si->markRead();
 
 			FixTabIcons();
 			if (!m_si->pDlg) {
@@ -882,10 +872,7 @@ INT_PTR CMsgDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 
 		SetFocus(m_message.GetHwnd());
 		if (isChat()) {
-			if (db_get_w(m_hContact, m_si->pszModule, "ApparentMode") != 0)
-				db_unset(m_hContact, m_si->pszModule, "ApparentMode");
-			if (Clist_GetEvent(m_hContact, 0))
-				Clist_RemoveEvent(m_hContact, GC_FAKE_EVENT);
+			m_si->markRead(true);
 		}
 		else {
 			if (m_hDbUnreadEventFirst != 0) {
diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp
index 31682a5f0e..166468ab11 100644
--- a/plugins/TabSRMM/src/chat_tools.cpp
+++ b/plugins/TabSRMM/src/chat_tools.cpp
@@ -40,8 +40,7 @@ static void __stdcall Chat_DismissPopup(void *pi)
 {
 	SESSION_INFO *si = (SESSION_INFO*)pi;
 	if (si->hContact)
-		if (Clist_GetEvent(si->hContact, 0))
-			Clist_RemoveEvent(si->hContact, GC_FAKE_EVENT);
+		si->markRead(true);
 
 	if (si->pDlg && si->pDlg->timerFlash.Stop())
 		FlashWindow(si->pDlg->GetHwnd(), FALSE);
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index d158902e32..a0fdd09f57 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -681,9 +681,7 @@ void CMsgDialog::OnDestroy()
 		DestroyWindow(m_hwndPanelPicParent);
 
 	if (m_si) {
-		if (Clist_GetEvent(m_si->hContact, 0))
-			Clist_RemoveEvent(m_si->hContact, GC_FAKE_EVENT);
-		m_si->wState &= ~STATE_TALK;
+		m_si->markRead(true);
 		m_si->pDlg = nullptr;
 		m_si = nullptr;
 	}
diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index 982ab1cdcb..f9d345a4d8 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -2590,10 +2590,7 @@ void CMsgDialog::UpdateWindowState(UINT msg)
 	if (m_si) {
 		m_hTabIcon = m_hTabStatusIcon;
 
-		if (db_get_w(m_si->hContact, m_si->pszModule, "ApparentMode") != 0)
-			db_unset(m_si->hContact, m_si->pszModule, "ApparentMode");
-		if (Clist_GetEvent(m_si->hContact, 0))
-			Clist_RemoveEvent(m_si->hContact, GC_FAKE_EVENT);
+		m_si->markRead(true);
 
 		UpdateTitle();
 		m_hTabIcon = m_hTabStatusIcon;
-- 
cgit v1.2.3