Clist_RemoveEvent became static, pfnRemoveEvent is replaced with pfnFreeEvent

22 files changed, 42 insertions, 59 deletions

diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
index 1a9285e4dc..641af4fbaf 100644
--- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp
+++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
@@ -163,14 +163,14 @@ LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
 	switch (message) {

 	case WM_COMMAND:

 		if (HIWORD(wParam) == STN_CLICKED) {

-			g_clistApi.pfnRemoveEvent(PUGetContact(hWnd), 0);

+			Clist_RemoveEvent(PUGetContact(hWnd), 0);

 			CallServiceSync("BuddyExpectator/actionReturned", PUGetContact(hWnd), 0);

 			PUDeletePopup(hWnd);

 		}

 		break;

 

 	case WM_CONTEXTMENU:

-		g_clistApi.pfnRemoveEvent(PUGetContact(hWnd), 0);

+		Clist_RemoveEvent(PUGetContact(hWnd), 0);

 		setLastSeen(PUGetContact(hWnd));

 		PUDeletePopup(hWnd);

 		break;

@@ -188,14 +188,14 @@ LRESULT CALLBACK PopupDlgProcNoSet(HWND hWnd, UINT message, WPARAM wParam, LPARA
 	switch (message) {

 	case WM_COMMAND:

 		if (HIWORD(wParam) == STN_CLICKED) {

-			g_clistApi.pfnRemoveEvent(PUGetContact(hWnd), 0);

+			Clist_RemoveEvent(PUGetContact(hWnd), 0);

 			CallServiceSync("BuddyExpectator/actionStillAbsent", (WPARAM)PUGetContact(hWnd), 0);

 			PUDeletePopup(hWnd);

 		}

 		break;

 

 	case WM_CONTEXTMENU:

-		g_clistApi.pfnRemoveEvent(PUGetContact(hWnd), 0);

+		Clist_RemoveEvent(PUGetContact(hWnd), 0);

 		PUDeletePopup(hWnd);

 		break;

 

diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp
index 6e809c6b4b..851076a1c5 100644
--- a/plugins/Clist_modern/src/init.cpp
+++ b/plugins/Clist_modern/src/init.cpp
@@ -206,7 +206,7 @@ static HRESULT SubclassClistInterface()
 	g_clistApi.pfnContactListControlWndProc = cli_ContactListControlWndProc;

 	g_clistApi.pfnProcessExternalMessages = cli_ProcessExternalMessages;

 	g_clistApi.pfnAddEvent = cli_AddEvent;

-	g_clistApi.pfnRemoveEvent = cli_RemoveEvent;

+	g_clistApi.pfnFreeEvent = cli_RemoveEvent;

 	g_clistApi.pfnDocking_ProcessWindowMessage = Docking_ProcessWindowMessage;

 	return S_OK;

 }

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index e918bcee65..d0eb4753d2 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -155,19 +155,11 @@ CListEvent* cli_AddEvent(CLISTEVENT *cle)
 }

 

 

-int cli_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent)

+int cli_RemoveEvent(CListEvent *pEvent)

 {

-	// Find the event that should be removed

-	CListEvent *pEvent = nullptr;

-	for (auto &it : *g_clistApi.events)

-		if (it->hContact == hContact && it->hDbEvent == hDbEvent) {

-			pEvent = it;

-			break;

-		}

-

-	// Event was not found

-	if (pEvent == nullptr)

-		return 1;

+	// save variables because pEvent should be freed

+	auto hContact = pEvent->hContact;

+	auto hDbEvent = pEvent->hDbEvent;

 

 	// remove event from the notify menu

 	int iMenuId = pEvent->menuId;

@@ -184,7 +176,7 @@ int cli_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent)
 		}

 	}

 

-	int res = corecli.pfnRemoveEvent(hContact, hDbEvent);

+	int res = corecli.pfnFreeEvent(pEvent);

 

 	if (g_clistApi.events->getCount() == 0) {

 		g_CluiData.bNotifyActive = false;

@@ -407,7 +399,7 @@ static LRESULT CALLBACK EventArea_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LP
 						// event we're interested in was removed by the service (nasty one...)

 						cle1 = MyGetEvent(iSelection);

 						if (cle1 != nullptr)

-							g_clistApi.pfnRemoveEvent(cle->hContact, cle->hDbEvent);

+							Clist_RemoveEvent(cle->hContact, cle->hDbEvent);

 					}

 				}

 			}

diff --git a/plugins/Clist_modern/src/modern_commonprototypes.h b/plugins/Clist_modern/src/modern_commonprototypes.h
index 78cc984508..69c0264136 100644
--- a/plugins/Clist_modern/src/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/modern_commonprototypes.h
@@ -214,7 +214,7 @@ int      cliGetGroupContentsCount(ClcGroup *group, int visibleOnly);
 int      cliFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk);

 int      cliGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex);

 int      cli_IconFromStatusMode(const char *szProto, int nStatus, MCONTACT hContact);

-int      cli_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent);

+int      cli_RemoveEvent(CListEvent *cle);

 void     cli_FreeContact(ClcContact*);

 void     cli_SetContactCheckboxes(ClcContact*, int);

 LRESULT  cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);

diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index 134738fcff..08a48dcede 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -161,7 +161,7 @@ LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 						// event we're interested in was removed by the service (nasty one...)

 						cle1 = MyGetEvent(iSelection);

 						if (cle1 != nullptr)

-							g_clistApi.pfnRemoveEvent(cle->hContact, cle->hDbEvent);

+							Clist_RemoveEvent(cle->hContact, cle->hDbEvent);

 					}

 				}

 			}

@@ -312,20 +312,8 @@ CListEvent* AddEvent(CLISTEVENT *cle)
 // wParam=(MCONTACT)hContact

 // lParam=(LPARAM)(HANDLE)hDbEvent

 // Returns 0 if the event was successfully removed, or nonzero if the event was not found

-int RemoveEvent(MCONTACT hContact, MEVENT hDbEvent)

+int RemoveEvent(CListEvent *e)

 {

-	// Find the event that should be removed

-	CListEvent *e = nullptr;

-	for (auto &it : *g_clistApi.events)

-		if (it->hContact == hContact && it->hDbEvent == hDbEvent) {

-			e = it;

-			break;

-		}

-

-	// Event was not found

-	if (e == nullptr)

-		return 1;

-

 	// remove event from the notify menu

 	int iMenuId = e->menuId;

 	if (iMenuId > 0) {

@@ -334,14 +322,17 @@ int RemoveEvent(MCONTACT hContact, MEVENT hDbEvent)
 		mii.fMask = MIIM_DATA;

 		if (GetMenuItemInfo(cfg::dat.hMenuNotify, iMenuId, FALSE, &mii) != 0) {

 			struct NotifyMenuItemExData *nmi = (struct NotifyMenuItemExData *) mii.dwItemData;

-			if (nmi && nmi->hContact == hContact && nmi->hDbEvent == hDbEvent) {

+			if (nmi && nmi->hContact == e->hContact && nmi->hDbEvent == e->hDbEvent) {

 				free(nmi);

 				DeleteMenu(cfg::dat.hMenuNotify, iMenuId, MF_BYCOMMAND);

 			}

 		}

 	}

 

-	int res = coreCli.pfnRemoveEvent(hContact, hDbEvent);

+	// save variables, because core call frees the structure

+	auto hContact = e->hContact;

+	auto hDbEvent = e->hDbEvent;

+	int res = coreCli.pfnFreeEvent(e);

 

 	if (g_clistApi.events->getCount() == 0) {

 		cfg::dat.bEventAreaEnabled = FALSE;

diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp
index a46350cb87..e9cf0b9f50 100644
--- a/plugins/Clist_nicer/src/init.cpp
+++ b/plugins/Clist_nicer/src/init.cpp
@@ -52,7 +52,7 @@ ClcGroup*   AddGroup(HWND hwnd, struct ClcData *dat, const wchar_t *szName, uint
 ClcContact* AddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hContact);

 ClcContact* AddInfoItemToGroup(ClcGroup *group, int flags, const wchar_t *pszText);

 LRESULT     ProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);

-int         RemoveEvent(MCONTACT hContact, MEVENT hDbEvent);

+int         RemoveEvent(CListEvent *);

 INT_PTR     TrayIconProcessMessage(WPARAM wParam, LPARAM lParam);

 void        RecalcScrollBar(HWND hwnd, struct ClcData *dat);

 

@@ -196,7 +196,7 @@ int CMPlugin::Load()
 	g_clistApi.pfnAddContactToGroup = AddContactToGroup;

 

 	g_clistApi.pfnAddEvent = AddEvent;

-	g_clistApi.pfnRemoveEvent = RemoveEvent;

+	g_clistApi.pfnFreeEvent = RemoveEvent;

 

 	g_clistApi.pfnAddGroup = AddGroup;

 	g_clistApi.pfnAddInfoItemToGroup = AddInfoItemToGroup;

diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp
index 5336ec84ee..a60d970173 100644
--- a/plugins/FileAsMessage/src/dialog.cpp
+++ b/plugins/FileAsMessage/src/dialog.cpp
@@ -67,7 +67,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 	case WM_COMMAND:

 	{

 		PUDeletePopup(hWnd);

-		g_clistApi.pfnRemoveEvent(hContact, 0);

+		Clist_RemoveEvent(hContact, 0);

 

 		if (IsWindow(hDlg)) {

 			ShowWindow(hDlg, SW_SHOWNORMAL);

@@ -488,7 +488,7 @@ void FILEECHO::onRecvTimer()
 		setState(STATE_FINISHED);

 		if (db_get_b(0, "SRFile", "AutoClose", 0)) {

 			PostMessage(hDlg, WM_CLOSE, 0, 0);

-			g_clistApi.pfnRemoveEvent(hContact, 0);

+			Clist_RemoveEvent(hContact, 0);

 		}

 		Skin_PlaySound("FileDone");

 		destroyTransfer();

diff --git a/plugins/HistoryPlusPlus/hpp_externalgrid.pas b/plugins/HistoryPlusPlus/hpp_externalgrid.pas
index ce87e08aef..b67e82c1f6 100644
--- a/plugins/HistoryPlusPlus/hpp_externalgrid.pas
+++ b/plugins/HistoryPlusPlus/hpp_externalgrid.pas
@@ -533,7 +533,7 @@ begin
   begin

     if (not Item.IsRead) then

       db_event_markRead(Items[Index].hContact, Items[Index].hDBEvent);

-    cli^.pfnRemoveEvent(Items[Index].hContact, Items[Index].hDBEvent);

+    Clist_RemoveEvent(Items[Index].hContact, Items[Index].hDBEvent);

   end

   else if (not Item.IsRead) and (MessageTypesToDWord(Item.MessageType) and

     MessageTypesToDWord([mtStatus, mtNickChange, mtAvatarChange]) > 0) then

diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp
index a314bbdce4..4908bd5340 100644
--- a/plugins/IEView/src/HTMLBuilder.cpp
+++ b/plugins/IEView/src/HTMLBuilder.cpp
@@ -206,7 +206,7 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event)
 

 		if (!(dbei.flags & DBEF_SENT) && dbei.eventType == EVENTTYPE_MESSAGE) {

 			db_event_markRead(event->hContact, hDbEvent);

-			g_clistApi.pfnRemoveEvent(event->hContact, hDbEvent);

+			Clist_RemoveEvent(event->hContact, hDbEvent);

 		}

 

 		if (!isDbEventShown(dbei)) {

diff --git a/plugins/MirandaG15/src/CAppletManager.cpp b/plugins/MirandaG15/src/CAppletManager.cpp
index 61135eac38..446bccb3bc 100644
--- a/plugins/MirandaG15/src/CAppletManager.cpp
+++ b/plugins/MirandaG15/src/CAppletManager.cpp
@@ -783,7 +783,7 @@ bool CAppletManager::IsMessageWindowOpen(MCONTACT hContact)
 void CAppletManager::MarkMessageAsRead(MCONTACT hContact, MEVENT hEvent)
 {
 	db_event_markRead(hContact, hEvent);
-	g_clistApi.pfnRemoveEvent(hContact, hEvent);
+	Clist_RemoveEvent(hContact, hEvent);
 }
 
 //************************************************************************
diff --git a/plugins/NewEventNotify/src/popup.cpp b/plugins/NewEventNotify/src/popup.cpp
index c0218bf43d..7dadd95c8e 100644
--- a/plugins/NewEventNotify/src/popup.cpp
+++ b/plugins/NewEventNotify/src/popup.cpp
@@ -82,7 +82,7 @@ int PopupAct(HWND hWnd, UINT mask, PLUGIN_DATA *pdata)
 	if (mask & MASK_REMOVE) {

 		if (pdata) {

 			for (auto &it: pdata->events) {

-				g_clistApi.pfnRemoveEvent(pdata->hContact, it);

+				Clist_RemoveEvent(pdata->hContact, it);

 				db_event_markRead(pdata->hContact, it);

 			}

 		}

diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp
index 9cb03ac103..51139dd075 100644
--- a/plugins/NewStory/src/history_array.cpp
+++ b/plugins/NewStory/src/history_array.cpp
@@ -115,7 +115,7 @@ void ItemData::load(bool bFullLoad)
 		if (!(dbe.flags & DBEF_SENT)) {
 			if (!dbe.markedRead())
 				db_event_markRead(hContact, hEvent);
-			g_clistApi.pfnRemoveEvent(hContact, hEvent);
+			Clist_RemoveEvent(hContact, hEvent);
 		}
 		__fallthrough;
 
diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index 125aa07d58..895ae9af79 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -118,7 +118,7 @@ static void RemoveReminderSystemEvent(REMINDERDATA *p)
 				break;

 

 			if ((ULONG)pev->lParam == p->uid && !pev->hContact && pev->pszService && !mir_strcmp(pev->pszService, MODULENAME"/OpenTriggeredReminder")) {

-				if (!g_clistApi.pfnRemoveEvent(pev->hContact, pev->hDbEvent)) {

+				if (!Clist_RemoveEvent(pev->hContact, pev->hDbEvent)) {

 					p->bSystemEventQueued = false;

 					if (QueuedReminderCount)

 						QueuedReminderCount--;

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index d6d589bd69..c35b779569 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -1042,7 +1042,7 @@ INT_PTR CMsgDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 				m_si->wState &= ~GC_EVENT_HIGHLIGHT;

 

 				if (Clist_GetEvent(m_hContact, 0))

-					g_clistApi.pfnRemoveEvent(m_hContact, GC_FAKE_EVENT);

+					Clist_RemoveEvent(m_hContact, GC_FAKE_EVENT);

 			}

 

 			FixTabIcons();

@@ -1064,7 +1064,7 @@ INT_PTR CMsgDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 			if (db_get_w(m_hContact, m_si->pszModule, "ApparentMode", 0) != 0)

 				db_set_w(m_hContact, m_si->pszModule, "ApparentMode", 0);

 			if (Clist_GetEvent(m_hContact, 0))

-				g_clistApi.pfnRemoveEvent(m_hContact, GC_FAKE_EVENT);

+				Clist_RemoveEvent(m_hContact, GC_FAKE_EVENT);

 		}

 		else {

 			if (m_hDbUnreadEventFirst != 0) {

@@ -1073,7 +1073,7 @@ INT_PTR CMsgDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 				while (hDbEvent != 0) {

 					DB::EventInfo dbei(hDbEvent, false);

 					if (!(dbei.flags & DBEF_SENT) && DbEventIsMessageOrCustom(dbei))

-						g_clistApi.pfnRemoveEvent(m_hContact, hDbEvent);

+						Clist_RemoveEvent(m_hContact, hDbEvent);

 					hDbEvent = db_event_next(m_hContact, hDbEvent);

 				}

 			}

diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp
index 0bbd71f0c7..264551e372 100644
--- a/plugins/Scriver/src/msgs.cpp
+++ b/plugins/Scriver/src/msgs.cpp
@@ -183,7 +183,7 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam)
 		wchar_t szTip[256];

 		mir_snwprintf(szTip, TranslateT("%s is typing a message"), Clist_GetContactDisplayName(hContact));

 		if (g_dat.flags2.bShowTypingClist) {

-			g_clistApi.pfnRemoveEvent(hContact, 1);

+			Clist_RemoveEvent(hContact, 1);

 

 			CLISTEVENT cle = {};

 			cle.hContact = hContact;

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)));

diff --git a/plugins/VoiceService/src/VoiceCall.cpp b/plugins/VoiceService/src/VoiceCall.cpp
index 0f3e88089f..60768f924c 100644
--- a/plugins/VoiceService/src/VoiceCall.cpp
+++ b/plugins/VoiceService/src/VoiceCall.cpp
@@ -193,7 +193,7 @@ void VoiceCall::CreateDisplayName()
 void VoiceCall::RemoveNotifications()
 {
 	if (clistBlinking) {
-		g_clistApi.pfnRemoveEvent(hContact, MEVENT(1001));
+		Clist_RemoveEvent(hContact, MEVENT(1001));
 		clistBlinking = false;
 	}