From f04b54e3fc162d475e8688784631a316f264f733 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 21 May 2023 14:56:39 +0300
Subject: Clist_RemoveEvent became static, pfnRemoveEvent is replaced with
 pfnFreeEvent

---
 plugins/TabSRMM/src/chat_tools.cpp    | 2 +-
 plugins/TabSRMM/src/hotkeyhandler.cpp | 4 ++--
 plugins/TabSRMM/src/mim.cpp           | 2 +-
 plugins/TabSRMM/src/msgdialog.cpp     | 2 +-
 plugins/TabSRMM/src/msgdlgother.cpp   | 4 ++--
 plugins/TabSRMM/src/msglog.cpp        | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/TabSRMM/src')

diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp
index 8c3d507819..f6340ffcd3 100644
--- a/plugins/TabSRMM/src/chat_tools.cpp
+++ b/plugins/TabSRMM/src/chat_tools.cpp
@@ -41,7 +41,7 @@ static void __stdcall Chat_DismissPopup(void *pi)
 	SESSION_INFO *si = (SESSION_INFO*)pi;
 	if (si->hContact)
 		if (Clist_GetEvent(si->hContact, 0))
-			g_clistApi.pfnRemoveEvent(si->hContact, GC_FAKE_EVENT);
+			Clist_RemoveEvent(si->hContact, GC_FAKE_EVENT);
 
 	if (si->pDlg && si->pDlg->timerFlash.Stop())
 		FlashWindow(si->pDlg->GetHwnd(), FALSE);
diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index 67685eabfa..1c649e6c4c 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -224,7 +224,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			if (cle) {
 				if (ServiceExists(cle->pszService)) {
 					CallService(cle->pszService, 0, (LPARAM)cle);
-					g_clistApi.pfnRemoveEvent(cle->hContact, cle->hDbEvent);
+					Clist_RemoveEvent(cle->hContact, cle->hDbEvent);
 				}
 			}
 			// still, we got that message posted.. the event may be waiting in tabSRMMs tray...
@@ -266,7 +266,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 
 	case DM_REMOVECLISTEVENT:
 		// sent from the popup to "dismiss" the event. we should do this in the main thread
-		g_clistApi.pfnRemoveEvent(wParam, lParam);
+		Clist_RemoveEvent(wParam, lParam);
 		db_event_markRead(wParam, lParam);
 		return 0;
 
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 07ad8f5f68..78d7a798b2 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -291,7 +291,7 @@ int CMimAPI::TypingMessage(WPARAM hContact, LPARAM nSecs)
 			Clist_TrayNotifyW(nullptr, TranslateT("Typing notification"), szTip, NIIF_INFO, 1000 * 4);
 
 		if (fShowOnClist) {
-			g_clistApi.pfnRemoveEvent(hContact, 1);
+			Clist_RemoveEvent(hContact, 1);
 
 			CLISTEVENT cle = {};
 			cle.hContact = hContact;
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 7d6316ac5f..253aa0c7b6 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -696,7 +696,7 @@ void CMsgDialog::OnDestroy()
 
 	if (m_si) {
 		if (Clist_GetEvent(m_si->hContact, 0))
-			g_clistApi.pfnRemoveEvent(m_si->hContact, GC_FAKE_EVENT);
+			Clist_RemoveEvent(m_si->hContact, GC_FAKE_EVENT);
 		m_si->wState &= ~STATE_TALK;
 		m_si->pDlg = nullptr;
 		m_si = nullptr;
diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index 5a736cd187..cabaad93fc 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -2954,7 +2954,7 @@ void CMsgDialog::UpdateWindowState(UINT msg)
 		if (db_get_w(m_si->hContact, m_si->pszModule, "ApparentMode", 0) != 0)
 			db_set_w(m_si->hContact, m_si->pszModule, "ApparentMode", 0);
 		if (Clist_GetEvent(m_si->hContact, 0))
-			g_clistApi.pfnRemoveEvent(m_si->hContact, GC_FAKE_EVENT);
+			Clist_RemoveEvent(m_si->hContact, GC_FAKE_EVENT);
 
 		UpdateTitle();
 		m_hTabIcon = m_hTabStatusIcon;
@@ -2983,7 +2983,7 @@ void CMsgDialog::UpdateWindowState(UINT msg)
 		if (m_bFlashClist) {
 			m_bFlashClist = false;
 			if (m_hFlashingEvent != 0)
-				g_clistApi.pfnRemoveEvent(m_hContact, m_hFlashingEvent);
+				Clist_RemoveEvent(m_hContact, m_hFlashingEvent);
 			m_hFlashingEvent = 0;
 		}
 		m_pContainer->cfg.flags.m_bNeedsUpdateTitle = false;
diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index 49743a5544..84967831e1 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -567,7 +567,7 @@ bool CLogWindow::CreateRtfEvent(RtfLogStreamData *streamData, DB::EventInfo &dbe
 	BOOL bIsStatusChangeEvent = IsStatusEvent(dbei.eventType);
 	if (!isSent && (bIsStatusChangeEvent || dbei.eventType == EVENTTYPE_MESSAGE || dbei.isSrmm())) {
 		db_event_markRead(streamData->hContact, streamData->hDbEvent);
-		g_clistApi.pfnRemoveEvent(streamData->hContact, streamData->hDbEvent);
+		Clist_RemoveEvent(streamData->hContact, streamData->hDbEvent);
 	}
 
 	CMStringW msg(ptrW(DbEvent_GetTextW(&dbei, CP_UTF8)));
-- 
cgit v1.2.3