Clist_RemoveEvent became static, pfnRemoveEvent is replaced with pfnFreeEvent

6 files changed, 12 insertions, 12 deletions

diff --git a/protocols/GmailNotifier/src/notify.cpp b/protocols/GmailNotifier/src/notify.cpp
index 73f744d421..99b26b8f55 100644
--- a/protocols/GmailNotifier/src/notify.cpp
+++ b/protocols/GmailNotifier/src/notify.cpp
@@ -73,7 +73,7 @@ int OpenBrowser(WPARAM hContact, LPARAM)
 	if (proto && !mir_strcmp(proto, MODULENAME)) {
 		Account *curAcc = GetAccountByContact(hContact);
 		PUDeletePopup(curAcc->popUpHwnd);
-		g_clistApi.pfnRemoveEvent(curAcc->hContact, 1);
+		Clist_RemoveEvent(curAcc->hContact, 1);
 		if (GetKeyState(VK_SHIFT) >> 8 || optionWindowIsOpen)
 			return FALSE;
 
@@ -114,7 +114,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 	case WM_CONTEXTMENU:
 		PUDeletePopup(hWnd);
 		curAcc->popUpHwnd = nullptr;
-		g_clistApi.pfnRemoveEvent(hContact, 1);
+		Clist_RemoveEvent(hContact, 1);
 	}
 	return DefWindowProc(hWnd, message, wParam, lParam);
 }
@@ -128,7 +128,7 @@ void NotifyUser(Account *curAcc)
 	switch (curAcc->results_num) {
 	case 0:
 		PUDeletePopup(curAcc->popUpHwnd);
-		g_clistApi.pfnRemoveEvent(curAcc->hContact, 1);
+		Clist_RemoveEvent(curAcc->hContact, 1);
 		if (curAcc->oldResults_num != 0)
 			g_plugin.setWord(curAcc->hContact, "Status", ID_STATUS_NONEW);
 		break;
@@ -156,7 +156,7 @@ void NotifyUser(Account *curAcc)
 			}
 		}
 		if (g_plugin.bNotifierOnTray && newMails > 0) {
-			g_clistApi.pfnRemoveEvent(curAcc->hContact, 1);
+			Clist_RemoveEvent(curAcc->hContact, 1);
 
 			CLISTEVENT cle = {};
 			cle.hContact = curAcc->hContact;
diff --git a/protocols/ICQ-WIM/src/poll.cpp b/protocols/ICQ-WIM/src/poll.cpp
index ec98ea9443..64cac1e12c 100644
--- a/protocols/ICQ-WIM/src/poll.cpp
+++ b/protocols/ICQ-WIM/src/poll.cpp
@@ -307,7 +307,7 @@ void CIcqProto::ProcessNotification(const JSONNode &ev)
 			

 			// we've read/removed some messages from server

 			if (iOldCount > m_unreadEmails) {

-				g_clistApi.pfnRemoveEvent(0, ICQ_FAKE_EVENT_ID);

+				Clist_RemoveEvent(0, ICQ_FAKE_EVENT_ID);

 				return;

 			}

 

diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp
index e8bdb1a5b3..f367bf727b 100644
--- a/protocols/IRCG/src/clist.cpp
+++ b/protocols/IRCG/src/clist.cpp
@@ -74,7 +74,7 @@ BOOL CIrcProto::CList_AddDCCChat(const CMStringW& name, const CMStringW& hostmas
 		cle.lParam = (LPARAM)pdci;

 

 		if (Clist_GetEvent(hContact, 0))

-			g_clistApi.pfnRemoveEvent(hContact, -100);

+			Clist_RemoveEvent(hContact, -100);

 		g_clistApi.pfnAddEvent(&cle);

 	}

 	return TRUE;

diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp
index 983683ec43..75a7ffa3b8 100644
--- a/protocols/JabberG/src/jabber_rc.cpp
+++ b/protocols/JabberG/src/jabber_rc.cpp
@@ -562,7 +562,7 @@ int CJabberProto::AdhocForwardHandler(const TiXmlElement*, CJabberIqInfo *pInfo,
 

 				db_event_markRead(hContact, hDbEvent, true);

 				if (bRemoveCListEvents)

-					g_clistApi.pfnRemoveEvent(hContact, hDbEvent);

+					Clist_RemoveEvent(hContact, hDbEvent);

 			}

 		}

 

diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index bd918b7b93..7e2d06bf90 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -818,9 +818,9 @@ void CVkProto::MarkDialogAsRead(MCONTACT hContact)
 		DBEVENTINFO dbei = {};

 		if (!db_event_get(hDBEvent, &dbei) && !mir_strcmp(m_szModuleName, dbei.szModule)) {

 			db_event_markRead(hContact, hDBEvent, true);

-			g_clistApi.pfnRemoveEvent(hMContact, hDBEvent);

+			Clist_RemoveEvent(hMContact, hDBEvent);

 			if (hContact != hMContact)

-				g_clistApi.pfnRemoveEvent(hContact, hDBEvent);

+				Clist_RemoveEvent(hContact, hDBEvent);

 		}

 

 		hDBEvent = db_event_next(hContact, hDBEvent);

diff --git a/protocols/YAMN/src/browser/mailbrowser.cpp b/protocols/YAMN/src/browser/mailbrowser.cpp
index 7b1b68e35a..ab0f5bd068 100644
--- a/protocols/YAMN/src/browser/mailbrowser.cpp
+++ b/protocols/YAMN/src/browser/mailbrowser.cpp
@@ -652,7 +652,7 @@ void DoMailActions(HWND hDlg, CAccount *ActualAccount, struct CMailNumbers *MN,
 

 	// and remove the event

 	if ((nflags & YAMN_ACC_CONT) && (!(nflags & YAMN_ACC_CONTNOEVENT)) && (MN->Real.UnSeen + MN->Virtual.UnSeen == 0))

-		g_clistApi.pfnRemoveEvent(ActualAccount->hContact, ActualAccount->hContact);

+		Clist_RemoveEvent(ActualAccount->hContact, ActualAccount->hContact);

 

 	if ((MN->Real.BrowserUC + MN->Virtual.BrowserUC == 0) && (hDlg != nullptr)) {

 		if (!IsWindowVisible(hDlg) && !(nflags & YAMN_ACC_MSG))

@@ -796,7 +796,7 @@ LRESULT CALLBACK NewMailPopupProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 				}

 			}

 			if ((Account->NewMailN.Flags & YAMN_ACC_CONT) && !(Account->NewMailN.Flags & YAMN_ACC_CONTNOEVENT))

-				g_clistApi.pfnRemoveEvent(hContact, hContact);

+				Clist_RemoveEvent(hContact, hContact);

 		}

 		__fallthrough;

 

@@ -1606,7 +1606,7 @@ INT_PTR CALLBACK DlgProcYAMNMailBrowser(HWND hDlg, UINT msg, WPARAM wParam, LPAR
 			SetTimer(hDlg, TIMER_FLASHING, 500, nullptr);

 

 			if (ActualAccount->hContact != NULL)

-				g_clistApi.pfnRemoveEvent(ActualAccount->hContact, (LPARAM)"yamn new mail message");

+				Clist_RemoveEvent(ActualAccount->hContact, (LPARAM)"yamn new mail message");

 

 			mir_subclassWindow(GetDlgItem(hDlg, IDC_LISTMAILS), ListViewSubclassProc);

 		}