removed not used icon

standard plugin description and version info

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

3 files changed, 23 insertions, 29 deletions

diff --git a/protocols/AimOscar/src/aim.cpp b/protocols/AimOscar/src/aim.cpp
index c619194e18..4af78fae52 100644
--- a/protocols/AimOscar/src/aim.cpp
+++ b/protocols/AimOscar/src/aim.cpp
@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 #include "aim.h"

-#include "version.h"

 

 char AIM_CAP_MIRANDA[16] = "MirandaA";

 

@@ -37,7 +36,6 @@ OBJLIST<CAimProto> g_Instances(1, sttCompareProtocols);
 /////////////////////////////////////////////////////////////////////////////////////////

 // Dll entry point

 

-extern "C"

 BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD /*fdwReason*/,LPVOID /*lpvReserved*/)

 {

 	hInstance = hinstDLL;

@@ -50,21 +48,22 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD /*fdwReason*/,LPVOID /*lpvReserved*
 static const PLUGININFOEX pluginInfo =

 {

 	sizeof(PLUGININFOEX),

-	"AIM Protocol",

-	__VERSION_DWORD,

-	"Provides support for AOL Instant Messenger (AIM) protocol.",

-	"Boris Krasnovskiy, Aaron Myles Landwehr",

-	"borkra@miranda-im.org",

-	"© 2008-2011 Boris Krasnovskiy, 2005-2006 Aaron Myles Landwehr",

-	"http://miranda-ng.org/",

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	{0x3750a5a3, 0xbf0d, 0x490e, {0xb6, 0x5d, 0x41, 0xac, 0x4d, 0x29, 0xae, 0xb3}} // {3750A5A3-BF0D-490e-B65D-41AC4D29AEB3}

+	// {3750A5A3-BF0D-490e-B65D-41AC4D29AEB3}

+	{0x3750a5a3, 0xbf0d, 0x490e, {0xb6, 0x5d, 0x41, 0xac, 0x4d, 0x29, 0xae, 0xb3}}

 };

 

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

 {

 	*(unsigned long*)(&AIM_CAP_MIRANDA[8]) = _htonl(mirandaVersion);

-	*(unsigned long*)(&AIM_CAP_MIRANDA[12]) = _htonl(__VERSION_DWORD);

+	*(unsigned long*)(&AIM_CAP_MIRANDA[12]) = _htonl(PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM));

 	return &pluginInfo;

 }

 

diff --git a/protocols/AimOscar/src/aim.h b/protocols/AimOscar/src/aim.h
index fb6d1071ee..e764ff3dc5 100644
--- a/protocols/AimOscar/src/aim.h
+++ b/protocols/AimOscar/src/aim.h
@@ -89,6 +89,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "proto.h"

 #include "theme.h"

 #include "ui.h"

+#include "version.h"

 

 // Protocol limits

 #define MAX_SCREEN_NAME_LENGTH      97

diff --git a/protocols/AimOscar/src/version.h b/protocols/AimOscar/src/version.h
index cd1ad86ac6..27ca00fb92 100644
--- a/protocols/AimOscar/src/version.h
+++ b/protocols/AimOscar/src/version.h
@@ -1,20 +1,14 @@
-/*

-Plugin of Miranda IM for communicating with users of the AIM protocol.

-Copyright (c) 2008-2009 Boris Krasnovskiy

+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				11

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					1

 

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

 

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-#define __FILEVERSION_STRING        0,11,0,1

-#define __VERSION_STRING            "0.11.0.1"

-#define __VERSION_DWORD             PLUGIN_MAKE_VERSION(0,11,0,1)

+#define __PLUGIN_NAME				"AIM protocol"

+#define __FILENAME					"AIM.dll"

+#define __DESCRIPTION 				"Provides support for AOL Instant Messenger (AIM) protocol."

+#define __AUTHOR					"Boris Krasnovskiy, Aaron Myles Landwehr"

+#define __AUTHOREMAIL				"borkra@miranda-im.org"

+#define __AUTHORWEB					"http://miranda-ng.org/"

+#define __COPYRIGHT					"© 2008-2011 Boris Krasnovskiy, 2005-2006 Aaron Myles Landwehr"