From 176e52e14fd0358a7f26ca8d7b0205244dfde2e7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 23 May 2018 23:29:25 +0300 Subject: no need to initialize pcli variable in each plugin (only in Clist_*) --- protocols/MRA/src/Mra.cpp | 3 --- protocols/MRA/src/Mra_functions.cpp | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'protocols/MRA/src') diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp index cc50b71add..afc0564e7b 100644 --- a/protocols/MRA/src/Mra.cpp +++ b/protocols/MRA/src/Mra.cpp @@ -1,7 +1,6 @@ #include "stdafx.h" CMPlugin g_plugin; -CLIST_INTERFACE *pcli; HMODULE g_hDLLXStatusIcons; HICON g_hMainIcon; @@ -42,8 +41,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOC extern "C" __declspec(dllexport) int Load(void) { - pcli = Clist_GetInterface(); - IconsLoad(); InitXStatusIcons(); return 0; diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index 91dd706532..6bf5697249 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -662,7 +662,7 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA & memcpy(pszServiceFunctionName, MRA_GOTO_INBOX, sizeof(MRA_GOTO_INBOX)); cle.pszService = szServiceFunction; } - pcli->pfnAddEvent(&cle); + g_CLI.pfnAddEvent(&cle); } Skin_PlaySound(szNewMailSound); @@ -675,7 +675,7 @@ void CMraProto::MraUpdateEmailStatus(const CMStringA &pszFrom, const CMStringA & else { if (!force_display && getByte("IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY)) { if (bTrayIconNewMailNotify) - pcli->pfnRemoveEvent(0, (LPARAM)m_szModuleName); + g_CLI.pfnRemoveEvent(0, (LPARAM)m_szModuleName); PUDeletePopup(hWndEMailPopupStatus); hWndEMailPopupStatus = nullptr; } -- cgit v1.2.3