removed old PLUGININFO. plugin info cleanup starts

git-svn-id: http://svn.miranda-ng.org/main/trunk@312 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 1 insertions, 23 deletions

diff --git a/plugins/mTextControl/src/headers.h b/plugins/mTextControl/src/headers.h
index cc2f4579b9..a2ff0df6ab 100644
--- a/plugins/mTextControl/src/headers.h
+++ b/plugins/mTextControl/src/headers.h
@@ -100,7 +100,6 @@ extern "C" {
 

 // globals

 extern HINSTANCE		hInst;

-extern PLUGININFO		pluginInfo;

 extern PLUGININFOEX		pluginInfoEx;

 

 // dlls

diff --git a/plugins/mTextControl/src/main.cpp b/plugins/mTextControl/src/main.cpp
index 285a3f2c8d..5418a7373b 100644
--- a/plugins/mTextControl/src/main.cpp
+++ b/plugins/mTextControl/src/main.cpp
@@ -52,20 +52,6 @@ PLUGININFOEX pluginInfoEx =
 	MTEXT_UUID

 };

 

-PLUGININFO pluginInfo =

-{

-	sizeof(PLUGININFO),

-	pluginInfoEx.shortName,

-	pluginInfoEx.version,

-	pluginInfoEx.description,

-	pluginInfoEx.author,

-	pluginInfoEx.authorEmail,

-	pluginInfoEx.copyright,

-	pluginInfoEx.homepage,

-	pluginInfoEx.flags,

-	pluginInfoEx.replacesDefaultModule

-};

-

 extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)

 {

 	hInst=hinstDLL;

@@ -75,15 +61,8 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvRese
 static HANDLE hModulesLoaded = 0;

 static int ModulesLoaded(WPARAM wParam,LPARAM lParam);

 

-extern "C" __declspec(dllexport) PLUGININFO *MirandaPluginInfo(DWORD mirandaVersion)

-{

-	pluginInfo.cbSize = sizeof(PLUGININFO);

-	return &pluginInfo;

-}

-

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

 {

-	pluginInfoEx.cbSize = sizeof(PLUGININFOEX);

 	return &pluginInfoEx;

 }

 

diff --git a/plugins/mTextControl/src/services.cpp b/plugins/mTextControl/src/services.cpp
index cb0b2a9e48..8970969ec4 100644
--- a/plugins/mTextControl/src/services.cpp
+++ b/plugins/mTextControl/src/services.cpp
@@ -336,7 +336,7 @@ INT_PTR MText_GetInterface(WPARAM wParam, LPARAM lParam) {
 	if ( MText == NULL )

 		return CALLSERVICE_NOTFOUND;

 

-	MText->version		= pluginInfo.version;

+	MText->version		= pluginInfoEx.version;

 	MText->Register		= MTI_TextUserAdd;

 	MText->Create		= MTI_MTextCreate;

 	MText->CreateW		= MTI_MTextCreateW;