From 8a74e7495ce5ad39de4f5c25121a84d35df90c36 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 20 May 2018 15:08:48 +0300
Subject: CMPlugin to receive a reference to PLUGININFOEX

---
 plugins/TabSRMM/src/msgs.h   |  4 +---
 plugins/TabSRMM/src/srmm.cpp | 10 +++++++---
 plugins/TabSRMM/src/stdafx.h |  1 -
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'plugins/TabSRMM/src')

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 7b1a36f1fb..de48faf728 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -1125,9 +1125,7 @@ struct SKINDESC
 
 struct CMPlugin : public PLUGIN<CMPlugin>
 {
-	CMPlugin() :
-		PLUGIN<CMPlugin>(SRMSGMOD)
-	{}
+	CMPlugin();
 };
 
 #endif /* _MSGS_H */
diff --git a/plugins/TabSRMM/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp
index 5c09ec31cb..53b1a0dbc3 100644
--- a/plugins/TabSRMM/src/srmm.cpp
+++ b/plugins/TabSRMM/src/srmm.cpp
@@ -40,7 +40,7 @@ CLIST_INTERFACE *pcli;
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-PLUGININFOEX pluginInfo = {
+PLUGININFOEX pluginInfoEx = {
 	sizeof(PLUGININFOEX),
 	__PLUGIN_NAME,
 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
@@ -53,9 +53,13 @@ PLUGININFOEX pluginInfo = {
 	{ 0x6ca5f042, 0x7a7f, 0x47cc, { 0xa7, 0x15, 0xfc, 0x8c, 0x46, 0xfb, 0xf4, 0x34 } }
 };
 
+CMPlugin::CMPlugin() :
+	PLUGIN<CMPlugin>(SRMSGMOD, pluginInfoEx)
+{}
+
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
 {
-	return &pluginInfo;
+	return &pluginInfoEx;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -72,7 +76,7 @@ extern "C" int __declspec(dllexport) Load(void)
 	}
 
 	pcli = Clist_GetInterface();
-	mir_getLP(&pluginInfo);
+	mir_getLP(&pluginInfoEx);
 
 	SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(lfDefault), &lfDefault, FALSE);
 
diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index f346cb50eb..6eea03c043 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -217,7 +217,6 @@ extern TContainerData *pFirstContainer, *pLastActiveContainer;
 extern ButtonSet g_ButtonSet;
 extern HANDLE g_hEvent;
 extern RECT rcLastStatusBarClick;
-extern PLUGININFOEX pluginInfo;
 extern TTemplateSet RTL_Active, LTR_Active;
 extern LOGFONTA logfonts[MSGDLGFONTCOUNT + 2];
 extern COLORREF fontcolors[MSGDLGFONTCOUNT + 2];
-- 
cgit v1.2.3