summaryrefslogtreecommitdiff
path: root/protocols/MRA
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-05-20 15:08:48 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-05-20 15:08:48 +0300
commit8a74e7495ce5ad39de4f5c25121a84d35df90c36 (patch)
tree03e5b4870f09a3163306740c2eebee47bc15b042 /protocols/MRA
parentc5bf7d6123dd1c3b82ccb8fdb1b068077e9d56d4 (diff)
CMPlugin to receive a reference to PLUGININFOEX
Diffstat (limited to 'protocols/MRA')
-rw-r--r--protocols/MRA/src/Mra.cpp13
-rw-r--r--protocols/MRA/src/MraProto.h6
2 files changed, 10 insertions, 9 deletions
diff --git a/protocols/MRA/src/Mra.cpp b/protocols/MRA/src/Mra.cpp
index 7fb4b0ed55..f129ed4093 100644
--- a/protocols/MRA/src/Mra.cpp
+++ b/protocols/MRA/src/Mra.cpp
@@ -1,5 +1,6 @@
#include "stdafx.h"
+CMPlugin g_plugin;
int &hLangpack(g_plugin.m_hLang);
CLIST_INTERFACE *pcli;
@@ -13,6 +14,8 @@ WCHAR g_szMirWorkDirPath[MAX_FILEPATH];
void IconsLoad();
+/////////////////////////////////////////////////////////////////////////////////////////
+
PLUGININFOEX pluginInfoEx = {
sizeof(PLUGININFOEX),
PROTOCOL_DISPLAY_NAME_ORIGA,
@@ -26,6 +29,12 @@ PLUGININFOEX pluginInfoEx = {
{ 0xe7c48bab, 0x8ace, 0x4cb3, { 0x84, 0x46, 0xd4, 0xb7, 0x34, 0x81, 0xf4, 0x97 } }
};
+CMPlugin::CMPlugin() :
+ ACCPROTOPLUGIN<CMraProto>("MRA", pluginInfoEx)
+{
+ SetUniqueId("e-mail");
+}
+
extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
return &pluginInfoEx;
@@ -33,10 +42,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
/////////////////////////////////////////////////////////////////////////////////////////
-CMPlugin g_plugin;
-
-/////////////////////////////////////////////////////////////////////////////////////////
-
extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = { MIID_PROTOCOL, MIID_LAST };
///////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h
index 80cbec1f33..0221580d3f 100644
--- a/protocols/MRA/src/MraProto.h
+++ b/protocols/MRA/src/MraProto.h
@@ -342,9 +342,5 @@ struct CMraProto : public PROTO<CMraProto>
struct CMPlugin : public ACCPROTOPLUGIN<CMraProto>
{
- CMPlugin() :
- ACCPROTOPLUGIN<CMraProto>("MRA")
- {
- SetUniqueId("e-mail");
- }
+ CMPlugin();
};