From ec8a7614a371f41937dc1dbc2d53289e45706e3a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 21 May 2023 13:56:23 +0300 Subject: static function pfnGetEvent removed from CLIST_INTERFACE --- plugins/TabSRMM/src/chat_tools.cpp | 2 +- plugins/TabSRMM/src/hotkeyhandler.cpp | 4 ++-- plugins/TabSRMM/src/msgdialog.cpp | 2 +- plugins/TabSRMM/src/msgdlgother.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp index 49063bf0a4..8c3d507819 100644 --- a/plugins/TabSRMM/src/chat_tools.cpp +++ b/plugins/TabSRMM/src/chat_tools.cpp @@ -40,7 +40,7 @@ static void __stdcall Chat_DismissPopup(void *pi) { SESSION_INFO *si = (SESSION_INFO*)pi; if (si->hContact) - if (g_clistApi.pfnGetEvent(si->hContact, 0)) + if (Clist_GetEvent(si->hContact, 0)) g_clistApi.pfnRemoveEvent(si->hContact, GC_FAKE_EVENT); if (si->pDlg && si->pDlg->timerFlash.Stop()) diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp index 5deb191552..67685eabfa 100644 --- a/plugins/TabSRMM/src/hotkeyhandler.cpp +++ b/plugins/TabSRMM/src/hotkeyhandler.cpp @@ -157,7 +157,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_HOTKEY: { - CLISTEVENT *cli = g_clistApi.pfnGetEvent(-1, 0); + auto *cli = Clist_GetEvent(-1, 0); if (cli != nullptr) { if (strncmp(cli->pszService, MS_MSG_TYPINGMESSAGE, mir_strlen(cli->pszService))) { CallService(cli->pszService, 0, (LPARAM)cli); @@ -220,7 +220,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP if (lParam == 0) HandleMenuEntryFromhContact(wParam); else { - CLISTEVENT *cle = g_clistApi.pfnGetEvent(wParam, 0); + auto *cle = Clist_GetEvent(wParam, 0); if (cle) { if (ServiceExists(cle->pszService)) { CallService(cle->pszService, 0, (LPARAM)cle); diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index b131ac952c..7d6316ac5f 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -695,7 +695,7 @@ void CMsgDialog::OnDestroy() DestroyWindow(m_hwndPanelPicParent); if (m_si) { - if (g_clistApi.pfnGetEvent(m_si->hContact, 0)) + if (Clist_GetEvent(m_si->hContact, 0)) g_clistApi.pfnRemoveEvent(m_si->hContact, GC_FAKE_EVENT); m_si->wState &= ~STATE_TALK; m_si->pDlg = nullptr; diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp index b04236acfb..5a736cd187 100644 --- a/plugins/TabSRMM/src/msgdlgother.cpp +++ b/plugins/TabSRMM/src/msgdlgother.cpp @@ -2953,7 +2953,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 (g_clistApi.pfnGetEvent(m_si->hContact, 0)) + if (Clist_GetEvent(m_si->hContact, 0)) g_clistApi.pfnRemoveEvent(m_si->hContact, GC_FAKE_EVENT); UpdateTitle(); -- cgit v1.2.3