Core plugins => CMPlugin

3 files changed, 9 insertions, 12 deletions

diff --git a/src/core/stdautoaway/src/autoaway.cpp b/src/core/stdautoaway/src/autoaway.cpp
index 3dda6e2d87..c5cf316d36 100644
--- a/src/core/stdautoaway/src/autoaway.cpp
+++ b/src/core/stdautoaway/src/autoaway.cpp
@@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "stdafx.h"

 

-#define AA_MODULE "AutoAway"

-

 static int iBreakSounds = 0;

 

 static int AutoAwaySound(WPARAM, LPARAM)

diff --git a/src/core/stdautoaway/src/main.cpp b/src/core/stdautoaway/src/main.cpp
index b7138e4b1f..cae20cf28f 100644
--- a/src/core/stdautoaway/src/main.cpp
+++ b/src/core/stdautoaway/src/main.cpp
@@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 

 int LoadAutoAwayModule(void);

 

-HINSTANCE hInst;

+CMPlugin g_plugin;

 int hLangpack;

 

 PLUGININFOEX pluginInfo = {

@@ -39,12 +39,6 @@ PLUGININFOEX pluginInfo = {
 	{ 0x9f5ca736, 0x1108, 0x4872, {0xbe, 0xc3, 0x19, 0xc8, 0x4b, 0xc2, 0x14, 0x3b}}

 };

 

-BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID)

-{

-	hInst = hinstDLL;

-	return TRUE;

-}

-

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

 {

 	return &pluginInfo;

diff --git a/src/core/stdautoaway/src/stdafx.h b/src/core/stdautoaway/src/stdafx.h
index 2f94563910..d785f0f238 100644
--- a/src/core/stdautoaway/src/stdafx.h
+++ b/src/core/stdautoaway/src/stdafx.h
@@ -40,9 +40,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <direct.h>

 #include <malloc.h>

 

-#define __NO_CMPLUGIN_NEEDED

 #include <win2k.h>

-

 #include <m_system.h>

 #include <newpluginapi.h>

 #include <m_utils.h>

@@ -67,4 +65,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "../../mir_app/src/resource.h"

 

-extern HINSTANCE hInst;

+#define AA_MODULE "AutoAway"

+

+struct CMPlugin : public PLUGIN<CMPlugin>

+{

+	CMPlugin() :

+		PLUGIN<CMPlugin>(AA_MODULE)

+	{}

+};