CMPlugin to receive a reference to PLUGININFOEX

3 files changed, 12 insertions, 10 deletions

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index ec5c940eaf..61a9de21b6 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -31,8 +31,6 @@
 

 #include "m_icolib.h"

 

-extern PLUGININFOEX pluginInfo;

-

 #pragma warning(disable:4355)

 

 static int CompareConns(const directconnect *p1, const directconnect *p2)

diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index e6cce5e4c6..aae9dead64 100644
--- a/protocols/IcqOscarJ/src/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
@@ -897,11 +897,7 @@ struct CIcqProto : public PROTO<CIcqProto>
 

 struct CMPlugin : public ACCPROTOPLUGIN<CIcqProto>

 {

-	CMPlugin() :

-		ACCPROTOPLUGIN<CIcqProto>(ICQ_PROTOCOL_NAME)

-	{

-		SetUniqueId(UNIQUEIDSETTING);

-	}

+	CMPlugin();

 };

 

 #endif

diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index bc84d3d8f5..0ee6885f44 100644
--- a/protocols/IcqOscarJ/src/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
@@ -34,7 +34,9 @@ BOOL bPopupService = FALSE;
 

 HANDLE hExtraXStatus;

 

-PLUGININFOEX pluginInfo = {

+/////////////////////////////////////////////////////////////////////////////////////////

+

+static PLUGININFOEX pluginInfoEx = {

 	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

@@ -46,9 +48,15 @@ PLUGININFOEX pluginInfo = {
 	{ 0x73a9615c, 0x7d4e, 0x4555, { 0xba, 0xdb, 0xee, 0x5, 0xdc, 0x92, 0x8e, 0xff } } // {73A9615C-7D4E-4555-BADB-EE05DC928EFF}

 };

 

+CMPlugin::CMPlugin() :

+	ACCPROTOPLUGIN<CIcqProto>(ICQ_PROTOCOL_NAME, pluginInfoEx)

+{

+	SetUniqueId(UNIQUEIDSETTING);

+}

+

 extern "C" PLUGININFOEX __declspec(dllexport) *MirandaPluginInfoEx(DWORD)

 {

-	return &pluginInfo;

+	return &pluginInfoEx;

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -74,7 +82,7 @@ IconItem iconList[] =
 

 extern "C" int __declspec(dllexport) Load(void)

 {

-	mir_getLP(&pluginInfo);

+	mir_getLP(&pluginInfoEx);

 

 	srand(time(0));

 	_tzset();