From 852b327946b004dc233a6fff4ac523c5ed8b3b45 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 20 May 2018 15:27:19 +0300 Subject: mir_getLP() call went into CMPluginBase::CMPluginBase, thus it's not needed in each plugin. mir_getLP() remains for compatibility with pascal plugins only --- src/core/stdautoaway/src/main.cpp | 2 -- src/core/stdaway/src/main.cpp | 2 -- src/core/stdclist/src/init.cpp | 1 - src/core/stdcrypt/src/main.cpp | 2 -- src/core/stdemail/src/main.cpp | 2 -- src/core/stdfile/src/main.cpp | 1 - src/core/stdidle/src/main.cpp | 1 - src/core/stdmsg/src/srmm.cpp | 1 - src/core/stdssl/src/main.cpp | 2 -- src/core/stduihist/src/main.cpp | 2 -- src/core/stduserinfo/src/main.cpp | 2 -- src/core/stduseronline/src/main.cpp | 1 - src/mir_app/src/CMPluginBase.cpp | 2 ++ 13 files changed, 2 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/core/stdautoaway/src/main.cpp b/src/core/stdautoaway/src/main.cpp index bc5d1d89ea..6976688e0d 100644 --- a/src/core/stdautoaway/src/main.cpp +++ b/src/core/stdautoaway/src/main.cpp @@ -58,8 +58,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_AUTOAW extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfoEx); - LoadAutoAwayModule(); return 0; } diff --git a/src/core/stdaway/src/main.cpp b/src/core/stdaway/src/main.cpp index 09deaf6fb9..97bb92f75d 100644 --- a/src/core/stdaway/src/main.cpp +++ b/src/core/stdaway/src/main.cpp @@ -58,8 +58,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRAWAY extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfoEx); - LoadAwayMsgModule(); return 0; } diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp index f499cc0134..7120d1252f 100644 --- a/src/core/stdclist/src/init.cpp +++ b/src/core/stdclist/src/init.cpp @@ -113,7 +113,6 @@ static INT_PTR GetStatusMode(WPARAM, LPARAM) extern "C" __declspec(dllexport) int CListInitialise() { - mir_getLP(&pluginInfoEx); pcli = Clist_GetInterface(); g_bSortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT); diff --git a/src/core/stdcrypt/src/main.cpp b/src/core/stdcrypt/src/main.cpp index 011511d37b..7eb04d8973 100644 --- a/src/core/stdcrypt/src/main.cpp +++ b/src/core/stdcrypt/src/main.cpp @@ -57,8 +57,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_CRYPTO extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfoEx); - return LoadEncryptionModule(); } diff --git a/src/core/stdemail/src/main.cpp b/src/core/stdemail/src/main.cpp index 5197155945..6d2ee559cd 100644 --- a/src/core/stdemail/src/main.cpp +++ b/src/core/stdemail/src/main.cpp @@ -58,8 +58,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SREMAI extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfoEx); - LoadSendRecvEMailModule(); return 0; } diff --git a/src/core/stdfile/src/main.cpp b/src/core/stdfile/src/main.cpp index d1ca18c66d..6c4ff31ae2 100644 --- a/src/core/stdfile/src/main.cpp +++ b/src/core/stdfile/src/main.cpp @@ -62,7 +62,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRFILE extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfoEx); pcli = Clist_GetInterface(); if ( IsWinVer7Plus()) diff --git a/src/core/stdidle/src/main.cpp b/src/core/stdidle/src/main.cpp index 5f7a5bb00e..933d7c2e9f 100644 --- a/src/core/stdidle/src/main.cpp +++ b/src/core/stdidle/src/main.cpp @@ -60,7 +60,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_IDLE, extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfoEx); pcli = Clist_GetInterface(); LoadIdleModule(); diff --git a/src/core/stdmsg/src/srmm.cpp b/src/core/stdmsg/src/srmm.cpp index 612e3b59c3..285cf31a33 100644 --- a/src/core/stdmsg/src/srmm.cpp +++ b/src/core/stdmsg/src/srmm.cpp @@ -60,7 +60,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SRMM, extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfoEx); pcli = Clist_GetInterface(); Load_ChatModule(); diff --git a/src/core/stdssl/src/main.cpp b/src/core/stdssl/src/main.cpp index 18fde05196..6485e43d2e 100644 --- a/src/core/stdssl/src/main.cpp +++ b/src/core/stdssl/src/main.cpp @@ -53,8 +53,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_SSL, M extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfoEx); - return LoadSslModule(); } diff --git a/src/core/stduihist/src/main.cpp b/src/core/stduihist/src/main.cpp index b9e2bd1fd5..9f8c700b0d 100644 --- a/src/core/stduihist/src/main.cpp +++ b/src/core/stduihist/src/main.cpp @@ -58,8 +58,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_UIHIST extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfoEx); - LoadHistoryModule(); return 0; } diff --git a/src/core/stduserinfo/src/main.cpp b/src/core/stduserinfo/src/main.cpp index 5a331de50c..a0d2af6e6a 100644 --- a/src/core/stduserinfo/src/main.cpp +++ b/src/core/stduserinfo/src/main.cpp @@ -58,8 +58,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_UIUSER extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfoEx); - LoadUserInfoModule(); return 0; } diff --git a/src/core/stduseronline/src/main.cpp b/src/core/stduseronline/src/main.cpp index ebbdf4f496..273409df55 100644 --- a/src/core/stduseronline/src/main.cpp +++ b/src/core/stduseronline/src/main.cpp @@ -59,7 +59,6 @@ extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_USERON extern "C" int __declspec(dllexport) Load(void) { - mir_getLP(&pluginInfoEx); pcli = Clist_GetInterface(); LoadUserOnlineModule(); diff --git a/src/mir_app/src/CMPluginBase.cpp b/src/mir_app/src/CMPluginBase.cpp index a5b18e2938..916a1e3f43 100644 --- a/src/mir_app/src/CMPluginBase.cpp +++ b/src/mir_app/src/CMPluginBase.cpp @@ -72,6 +72,8 @@ CMPluginBase::CMPluginBase(const char *moduleName, const PLUGININFOEX &pInfo) : m_szModuleName(moduleName), m_pInfo(pInfo) { + mir_getLP(&pInfo, &m_hLang); + if (m_hInst != nullptr) pluginListAddr.insert(this); } -- cgit v1.2.3