132 files changed, 162 insertions, 125 deletions

diff --git a/plugins/Chat/src/version.h b/plugins/Chat/src/version.h
deleted file mode 100644
index 0231d7a7ea..0000000000
--- a/plugins/Chat/src/version.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __FILEVERSION_STRING        0,11,0,1

-#define __VERSION_STRING            "0.11.0.1"

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

diff --git a/plugins/Clist_classic/src/version.h b/plugins/Clist_classic/src/version.h
deleted file mode 100644
index 0231d7a7ea..0000000000
--- a/plugins/Clist_classic/src/version.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __FILEVERSION_STRING        0,11,0,1

-#define __VERSION_STRING            "0.11.0.1"

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

diff --git a/plugins/SRMM/src/version.h b/plugins/SRMM/src/version.h
deleted file mode 100644
index 0231d7a7ea..0000000000
--- a/plugins/SRMM/src/version.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#define __FILEVERSION_STRING        0,11,0,1

-#define __VERSION_STRING            "0.11.0.1"

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

diff --git a/src/core/modules.cpp b/src/core/modules.cpp
index 5969fdcd0e..645f238872 100644
--- a/src/core/modules.cpp
+++ b/src/core/modules.cpp
@@ -64,7 +64,8 @@ int LoadFontserviceModule(void); // ui: font manager
 int LoadIcoLibModule(void);   // ui: icons manager

 int LoadServiceModePlugin(void);

 int LoadDefaultServiceModePlugin(void);

-int LoadErrorsModule();

+int LoadErrorsModule(void);

+int LoadStdPlugins(void);

 

 void UnloadUtilsModule(void);

 void UnloadButtonModule(void);

@@ -156,15 +157,7 @@ int LoadDefaultModules(void)
 	if ( LoadFindAddModule()) return 1;

 	if ( LoadIgnoreModule()) return 1;

 	if ( LoadVisibilityModule()) return 1;

-

-	for (int i=0; i < 11; i++) {

-		if ( pluginDefault[i].pImpl )

-			continue;

-

-		if ( !LoadCorePlugin(pluginDefault[i]))

-			return 1;

-	}

-

+	if ( LoadStdPlugins()) return 1;

 	return 0;

 }

 

diff --git a/src/core/stdauth/version.h b/src/core/stdauth/version.h
index ecaa3daa78..6cde63bca4 100644
--- a/src/core/stdauth/version.h
+++ b/src/core/stdauth/version.h
@@ -8,7 +8,7 @@
 #define __INTERNAL_NAME				"stdauth"

 #define __FILENAME					"stdauth.dll"

 #define __DESCRIPTION 				"Core module for sending/receiving auth requests."

-#define __AUTHOR                 "Myranda team"

+#define __AUTHOR                 "Miranda NG Development Team"

 #define __AUTHOREMAIL				""

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

-#define __COPYRIGHT					"© 2012 Myranda team"

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/src/core/stdautoaway/version.h b/src/core/stdautoaway/version.h
index 903c7bbbac..187cd1fe13 100644
--- a/src/core/stdautoaway/version.h
+++ b/src/core/stdautoaway/version.h
@@ -8,7 +8,7 @@
 #define __INTERNAL_NAME				"stdautoaway"

 #define __FILENAME					"stdautoaway.dll"

 #define __DESCRIPTION 				"Core module for away state processing."

-#define __AUTHOR                 "Myranda team"

+#define __AUTHOR                 "Miranda NG Development Team"

 #define __AUTHOREMAIL				""

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

-#define __COPYRIGHT					"© 2012 Myranda team"

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/src/core/stdaway/version.h b/src/core/stdaway/version.h
index 4cf976b665..675a9844fb 100644
--- a/src/core/stdaway/version.h
+++ b/src/core/stdaway/version.h
@@ -8,7 +8,7 @@
 #define __INTERNAL_NAME				"stdaway"

 #define __FILENAME					"stdaway.dll"

 #define __DESCRIPTION 				"Core module for the away messages processing."

-#define __AUTHOR                 "Myranda team"

+#define __AUTHOR                 "Miranda NG Development Team"

 #define __AUTHOREMAIL				""

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

-#define __COPYRIGHT					"© 2012 Myranda team"

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/plugins/Chat/chat_10.vcxproj b/src/core/stdchat/chat_10.vcxproj
index 9bf9977902..f87dbffec7 100644
--- a/plugins/Chat/chat_10.vcxproj
+++ b/src/core/stdchat/chat_10.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>

+<?xml version="1.0" encoding="utf-8"?>

 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup Label="ProjectConfigurations">

     <ProjectConfiguration Include="Debug|Win32">

@@ -19,7 +19,7 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectName>Chat</ProjectName>

+    <ProjectName>stdchat</ProjectName>

     <ProjectGuid>{268BD296-8DD3-4715-A386-CF120398EC98}</ProjectGuid>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

@@ -59,20 +59,20 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

     <IgnoreImportLibrary>true</IgnoreImportLibrary>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CHAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -86,7 +86,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalOptions>/DLL %(AdditionalOptions)</AdditionalOptions>

@@ -102,7 +102,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;CHAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <MinimalRebuild>true</MinimalRebuild>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -115,7 +115,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalOptions>/DLL %(AdditionalOptions)</AdditionalOptions>

@@ -134,7 +134,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CHAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -148,7 +148,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

@@ -169,7 +169,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\plugins\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;CHAT_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -183,7 +183,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

diff --git a/plugins/Chat/chat_10.vcxproj.filters b/src/core/stdchat/chat_10.vcxproj.filters
index f0744d306e..f0744d306e 100644
--- a/plugins/Chat/chat_10.vcxproj.filters
+++ b/src/core/stdchat/chat_10.vcxproj.filters
diff --git a/plugins/Chat/docs/Chat_Readme.txt b/src/core/stdchat/docs/Chat_Readme.txt
index 331fc555fc..331fc555fc 100644
--- a/plugins/Chat/docs/Chat_Readme.txt
+++ b/src/core/stdchat/docs/Chat_Readme.txt
diff --git a/plugins/Chat/docs/Chat_license.txt b/src/core/stdchat/docs/Chat_license.txt
index 7f1161073d..7f1161073d 100644
--- a/plugins/Chat/docs/Chat_license.txt
+++ b/src/core/stdchat/docs/Chat_license.txt
diff --git a/plugins/Chat/docs/chat-translation.txt b/src/core/stdchat/docs/chat-translation.txt
index 24c8d5c97a..24c8d5c97a 100644
--- a/plugins/Chat/docs/chat-translation.txt
+++ b/src/core/stdchat/docs/chat-translation.txt
diff --git a/plugins/Chat/res/1.ico b/src/core/stdchat/res/1.ico
index 51dcdc4648..51dcdc4648 100644
--- a/plugins/Chat/res/1.ico
+++ b/src/core/stdchat/res/1.ico
diff --git a/plugins/Chat/res/2.ico b/src/core/stdchat/res/2.ico
index 819ecc1d7a..819ecc1d7a 100644
--- a/plugins/Chat/res/2.ico
+++ b/src/core/stdchat/res/2.ico
diff --git a/plugins/Chat/res/3.ico b/src/core/stdchat/res/3.ico
index 0928e257fe..0928e257fe 100644
--- a/plugins/Chat/res/3.ico
+++ b/src/core/stdchat/res/3.ico
diff --git a/plugins/Chat/res/4.ico b/src/core/stdchat/res/4.ico
index 5dcea114fa..5dcea114fa 100644
--- a/plugins/Chat/res/4.ico
+++ b/src/core/stdchat/res/4.ico
diff --git a/plugins/Chat/res/5.ico b/src/core/stdchat/res/5.ico
index 6aa5806c53..6aa5806c53 100644
--- a/plugins/Chat/res/5.ico
+++ b/src/core/stdchat/res/5.ico
diff --git a/plugins/Chat/res/6.ico b/src/core/stdchat/res/6.ico
index c35cc39ebc..c35cc39ebc 100644
--- a/plugins/Chat/res/6.ico
+++ b/src/core/stdchat/res/6.ico
diff --git a/plugins/Chat/res/action.ico b/src/core/stdchat/res/action.ico
index 44816c42d7..44816c42d7 100644
--- a/plugins/Chat/res/action.ico
+++ b/src/core/stdchat/res/action.ico
diff --git a/plugins/Chat/res/addmode.ico b/src/core/stdchat/res/addmode.ico
index a6a7e6f38c..a6a7e6f38c 100644
--- a/plugins/Chat/res/addmode.ico
+++ b/src/core/stdchat/res/addmode.ico
diff --git a/plugins/Chat/res/bkgcolor.ico b/src/core/stdchat/res/bkgcolor.ico
index e3322ef34b..e3322ef34b 100644
--- a/plugins/Chat/res/bkgcolor.ico
+++ b/src/core/stdchat/res/bkgcolor.ico
diff --git a/plugins/Chat/res/blank.ico b/src/core/stdchat/res/blank.ico
index 7845f62fed..7845f62fed 100644
--- a/plugins/Chat/res/blank.ico
+++ b/src/core/stdchat/res/blank.ico
diff --git a/plugins/Chat/res/bold.ico b/src/core/stdchat/res/bold.ico
index fc34113b6b..fc34113b6b 100644
--- a/plugins/Chat/res/bold.ico
+++ b/src/core/stdchat/res/bold.ico
diff --git a/plugins/Chat/res/chat.rc b/src/core/stdchat/res/chat.rc
index fc81743d84..fc81743d84 100644
--- a/plugins/Chat/res/chat.rc
+++ b/src/core/stdchat/res/chat.rc
diff --git a/plugins/Chat/res/close.ico b/src/core/stdchat/res/close.ico
index 20f12dd61f..20f12dd61f 100644
--- a/plugins/Chat/res/close.ico
+++ b/src/core/stdchat/res/close.ico
diff --git a/plugins/Chat/res/color.ico b/src/core/stdchat/res/color.ico
index 689762edbb..689762edbb 100644
--- a/plugins/Chat/res/color.ico
+++ b/src/core/stdchat/res/color.ico
diff --git a/plugins/Chat/res/filter.ico b/src/core/stdchat/res/filter.ico
index 7c99edb58c..7c99edb58c 100644
--- a/plugins/Chat/res/filter.ico
+++ b/src/core/stdchat/res/filter.ico
diff --git a/plugins/Chat/res/filter2.ico b/src/core/stdchat/res/filter2.ico
index 701890522b..701890522b 100644
--- a/plugins/Chat/res/filter2.ico
+++ b/src/core/stdchat/res/filter2.ico
diff --git a/plugins/Chat/res/highlight.ico b/src/core/stdchat/res/highlight.ico
index 552c912eaa..552c912eaa 100644
--- a/plugins/Chat/res/highlight.ico
+++ b/src/core/stdchat/res/highlight.ico
diff --git a/plugins/Chat/res/history.ico b/src/core/stdchat/res/history.ico
index e757b93e54..e757b93e54 100644
--- a/plugins/Chat/res/history.ico
+++ b/src/core/stdchat/res/history.ico
diff --git a/plugins/Chat/res/info.ico b/src/core/stdchat/res/info.ico
index 1acdb7190b..1acdb7190b 100644
--- a/plugins/Chat/res/info.ico
+++ b/src/core/stdchat/res/info.ico
diff --git a/plugins/Chat/res/italics.ico b/src/core/stdchat/res/italics.ico
index 5c61422a71..5c61422a71 100644
--- a/plugins/Chat/res/italics.ico
+++ b/src/core/stdchat/res/italics.ico
diff --git a/plugins/Chat/res/join.ico b/src/core/stdchat/res/join.ico
index 151cd93211..151cd93211 100644
--- a/plugins/Chat/res/join.ico
+++ b/src/core/stdchat/res/join.ico
diff --git a/plugins/Chat/res/kick.ico b/src/core/stdchat/res/kick.ico
index c93e92dd77..c93e92dd77 100644
--- a/plugins/Chat/res/kick.ico
+++ b/src/core/stdchat/res/kick.ico
diff --git a/plugins/Chat/res/message.ico b/src/core/stdchat/res/message.ico
index 19957e4ac8..19957e4ac8 100644
--- a/plugins/Chat/res/message.ico
+++ b/src/core/stdchat/res/message.ico
diff --git a/plugins/Chat/res/messageout.ico b/src/core/stdchat/res/messageout.ico
index 637196b745..637196b745 100644
--- a/plugins/Chat/res/messageout.ico
+++ b/src/core/stdchat/res/messageout.ico
diff --git a/plugins/Chat/res/nick.ico b/src/core/stdchat/res/nick.ico
index 3f199ffd50..3f199ffd50 100644
--- a/plugins/Chat/res/nick.ico
+++ b/src/core/stdchat/res/nick.ico
diff --git a/plugins/Chat/res/nicklist.ico b/src/core/stdchat/res/nicklist.ico
index f2f611d6a4..f2f611d6a4 100644
--- a/plugins/Chat/res/nicklist.ico
+++ b/src/core/stdchat/res/nicklist.ico
diff --git a/plugins/Chat/res/nicklist2.ico b/src/core/stdchat/res/nicklist2.ico
index cba204fe5e..cba204fe5e 100644
--- a/plugins/Chat/res/nicklist2.ico
+++ b/src/core/stdchat/res/nicklist2.ico
diff --git a/plugins/Chat/res/notice.ico b/src/core/stdchat/res/notice.ico
index 1ba34d7244..1ba34d7244 100644
--- a/plugins/Chat/res/notice.ico
+++ b/src/core/stdchat/res/notice.ico
diff --git a/plugins/Chat/res/overlay.ico b/src/core/stdchat/res/overlay.ico
index 28742d898d..28742d898d 100644
--- a/plugins/Chat/res/overlay.ico
+++ b/src/core/stdchat/res/overlay.ico
diff --git a/plugins/Chat/res/part.ico b/src/core/stdchat/res/part.ico
index 39c24868aa..39c24868aa 100644
--- a/plugins/Chat/res/part.ico
+++ b/src/core/stdchat/res/part.ico
diff --git a/plugins/Chat/res/quit.ico b/src/core/stdchat/res/quit.ico
index d7fbdaf4b7..d7fbdaf4b7 100644
--- a/plugins/Chat/res/quit.ico
+++ b/src/core/stdchat/res/quit.ico
diff --git a/plugins/Chat/res/removestatus.ico b/src/core/stdchat/res/removestatus.ico
index ea3cef3fef..ea3cef3fef 100644
--- a/plugins/Chat/res/removestatus.ico
+++ b/src/core/stdchat/res/removestatus.ico
diff --git a/plugins/Chat/res/smiley.ico b/src/core/stdchat/res/smiley.ico
index e0d066ce33..e0d066ce33 100644
--- a/plugins/Chat/res/smiley.ico
+++ b/src/core/stdchat/res/smiley.ico
diff --git a/plugins/Chat/res/smileyc.ico b/src/core/stdchat/res/smileyc.ico
index d5b8ab0d28..d5b8ab0d28 100644
--- a/plugins/Chat/res/smileyc.ico
+++ b/src/core/stdchat/res/smileyc.ico
diff --git a/plugins/Chat/res/tag1.ico b/src/core/stdchat/res/tag1.ico
index 1dc687becd..1dc687becd 100644
--- a/plugins/Chat/res/tag1.ico
+++ b/src/core/stdchat/res/tag1.ico
diff --git a/plugins/Chat/res/tag2.ico b/src/core/stdchat/res/tag2.ico
index 4fac50a4c8..4fac50a4c8 100644
--- a/plugins/Chat/res/tag2.ico
+++ b/src/core/stdchat/res/tag2.ico
diff --git a/plugins/Chat/res/topic.ico b/src/core/stdchat/res/topic.ico
index e4bb7da7e0..e4bb7da7e0 100644
--- a/plugins/Chat/res/topic.ico
+++ b/src/core/stdchat/res/topic.ico
diff --git a/plugins/Chat/res/topicbut.ico b/src/core/stdchat/res/topicbut.ico
index ddb72fb8ca..ddb72fb8ca 100644
--- a/plugins/Chat/res/topicbut.ico
+++ b/src/core/stdchat/res/topicbut.ico
diff --git a/plugins/Chat/res/underline.ico b/src/core/stdchat/res/underline.ico
index 01cf64a36a..01cf64a36a 100644
--- a/plugins/Chat/res/underline.ico
+++ b/src/core/stdchat/res/underline.ico
diff --git a/plugins/Chat/res/version.rc b/src/core/stdchat/res/version.rc
index c415fe9f91..c415fe9f91 100644
--- a/plugins/Chat/res/version.rc
+++ b/src/core/stdchat/res/version.rc
diff --git a/plugins/Chat/res/window.ico b/src/core/stdchat/res/window.ico
index b2c9e0f7b1..b2c9e0f7b1 100644
--- a/plugins/Chat/res/window.ico
+++ b/src/core/stdchat/res/window.ico
diff --git a/plugins/Chat/src/chat.h b/src/core/stdchat/src/chat.h
index f8130358aa..f8130358aa 100644
--- a/plugins/Chat/src/chat.h
+++ b/src/core/stdchat/src/chat.h
diff --git a/plugins/Chat/src/clist.cpp b/src/core/stdchat/src/clist.cpp
index df60f1de3a..df60f1de3a 100644
--- a/plugins/Chat/src/clist.cpp
+++ b/src/core/stdchat/src/clist.cpp
diff --git a/plugins/Chat/src/colorchooser.cpp b/src/core/stdchat/src/colorchooser.cpp
index 0d2642165f..0d2642165f 100644
--- a/plugins/Chat/src/colorchooser.cpp
+++ b/src/core/stdchat/src/colorchooser.cpp
diff --git a/plugins/Chat/src/log.cpp b/src/core/stdchat/src/log.cpp
index 86b2f41b0a..86b2f41b0a 100644
--- a/plugins/Chat/src/log.cpp
+++ b/src/core/stdchat/src/log.cpp
diff --git a/plugins/Chat/src/main.cpp b/src/core/stdchat/src/main.cpp
index 7d72e85c8b..e9927f4442 100644
--- a/plugins/Chat/src/main.cpp
+++ b/src/core/stdchat/src/main.cpp
@@ -52,13 +52,13 @@ struct GlobalLogSettings_t g_Settings;
 

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

-	"Chat",

-	__VERSION_DWORD,

-	"Provides chat rooms for protocols supporting it",

-	"Miranda team",

-	"project-info@miranda-im.org",

-	"© 2003-2010 Miranda team",

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

+	__PLUGIN_NAME,

+	MIRANDA_VERSION_DWORD,

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

     {0x9d6c3213, 0x2b4, 0x4fe1, { 0x92, 0xe6, 0x52, 0x6d, 0xe2, 0x4f, 0x8d, 0x65 }} //{9D6C3213-02B4-4fe1-92E6-526DE24F8D65}

 };

diff --git a/plugins/Chat/src/manager.cpp b/src/core/stdchat/src/manager.cpp
index 02a0f76a59..02a0f76a59 100644
--- a/plugins/Chat/src/manager.cpp
+++ b/src/core/stdchat/src/manager.cpp
diff --git a/plugins/Chat/src/message.cpp b/src/core/stdchat/src/message.cpp
index ce76bfc6f5..ce76bfc6f5 100644
--- a/plugins/Chat/src/message.cpp
+++ b/src/core/stdchat/src/message.cpp
diff --git a/plugins/Chat/src/options.cpp b/src/core/stdchat/src/options.cpp
index 89d39d7f47..89d39d7f47 100644
--- a/plugins/Chat/src/options.cpp
+++ b/src/core/stdchat/src/options.cpp
diff --git a/plugins/Chat/src/resource.h b/src/core/stdchat/src/resource.h
index f95fa7dd01..f95fa7dd01 100644
--- a/plugins/Chat/src/resource.h
+++ b/src/core/stdchat/src/resource.h
diff --git a/plugins/Chat/src/richutil.cpp b/src/core/stdchat/src/richutil.cpp
index 1c5143b17c..1c5143b17c 100644
--- a/plugins/Chat/src/richutil.cpp
+++ b/src/core/stdchat/src/richutil.cpp
diff --git a/plugins/Chat/src/richutil.h b/src/core/stdchat/src/richutil.h
index dff6a53915..dff6a53915 100644
--- a/plugins/Chat/src/richutil.h
+++ b/src/core/stdchat/src/richutil.h
diff --git a/plugins/Chat/src/services.cpp b/src/core/stdchat/src/services.cpp
index 06e4f20cc8..06e4f20cc8 100644
--- a/plugins/Chat/src/services.cpp
+++ b/src/core/stdchat/src/services.cpp
diff --git a/plugins/Chat/src/tools.cpp b/src/core/stdchat/src/tools.cpp
index fa8f28ead3..fa8f28ead3 100644
--- a/plugins/Chat/src/tools.cpp
+++ b/src/core/stdchat/src/tools.cpp
diff --git a/src/core/stdchat/src/version.h b/src/core/stdchat/src/version.h
new file mode 100644
index 0000000000..c553761412
--- /dev/null
+++ b/src/core/stdchat/src/version.h
@@ -0,0 +1,14 @@
+

+#include <m_version.h>

+

+#define __FILEVERSION_STRING		MIRANDA_VERSION_FILEVERSION

+#define __VERSION_STRING			MIRANDA_VERSION_STRING

+

+#define __PLUGIN_NAME				"Standard Chat"

+#define __INTERNAL_NAME				"stdchat"

+#define __FILENAME					"stdchat.dll"

+#define __DESCRIPTION 				"Core module for providing chat rooms support."

+#define __AUTHOR                 "Miranda NG Development Team"

+#define __AUTHOREMAIL				""

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

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/plugins/Chat/src/window.cpp b/src/core/stdchat/src/window.cpp
index ccddae051b..ccddae051b 100644
--- a/plugins/Chat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
diff --git a/plugins/Clist_classic/clist_10.vcxproj b/src/core/stdclist/clist_10.vcxproj
index 760bebe46b..388e84c57a 100644
--- a/plugins/Clist_classic/clist_10.vcxproj
+++ b/src/core/stdclist/clist_10.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectName>Clist_classic</ProjectName>

+    <ProjectName>StdClist</ProjectName>

     <ProjectGuid>{E71C1722-A41D-4475-87F4-29961A3654BB}</ProjectGuid>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

@@ -59,20 +59,20 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

     <IgnoreImportLibrary>true</IgnoreImportLibrary>

   </PropertyGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -86,7 +86,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -102,7 +102,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -115,7 +115,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -133,7 +133,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -145,7 +145,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -166,7 +166,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;CLIST_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -178,7 +178,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/plugins/Clist_classic/clist_10.vcxproj.filters b/src/core/stdclist/clist_10.vcxproj.filters
index fa8001046e..fa8001046e 100644
--- a/plugins/Clist_classic/clist_10.vcxproj.filters
+++ b/src/core/stdclist/clist_10.vcxproj.filters
diff --git a/plugins/Clist_classic/docs/clist-license.txt b/src/core/stdclist/docs/clist-license.txt
index 7f1161073d..7f1161073d 100644
--- a/plugins/Clist_classic/docs/clist-license.txt
+++ b/src/core/stdclist/docs/clist-license.txt
diff --git a/plugins/Clist_classic/docs/clist-readme.txt b/src/core/stdclist/docs/clist-readme.txt
index 68b9df24d3..68b9df24d3 100644
--- a/plugins/Clist_classic/docs/clist-readme.txt
+++ b/src/core/stdclist/docs/clist-readme.txt
diff --git a/plugins/Clist_classic/docs/clist-translation.txt b/src/core/stdclist/docs/clist-translation.txt
index f213719525..f213719525 100644
--- a/plugins/Clist_classic/docs/clist-translation.txt
+++ b/src/core/stdclist/docs/clist-translation.txt
diff --git a/plugins/Clist_classic/docs/clist_classic-translation.txt b/src/core/stdclist/docs/clist_classic-translation.txt
index 2ccfedb7e5..2ccfedb7e5 100644
--- a/plugins/Clist_classic/docs/clist_classic-translation.txt
+++ b/src/core/stdclist/docs/clist_classic-translation.txt
diff --git a/plugins/Clist_classic/res/blank.ico b/src/core/stdclist/res/blank.ico
index 7845f62fed..7845f62fed 100644
--- a/plugins/Clist_classic/res/blank.ico
+++ b/src/core/stdclist/res/blank.ico
diff --git a/plugins/Clist_classic/res/dragcopy.cur b/src/core/stdclist/res/dragcopy.cur
index 89c7c960d5..89c7c960d5 100644
--- a/plugins/Clist_classic/res/dragcopy.cur
+++ b/src/core/stdclist/res/dragcopy.cur
diff --git a/plugins/Clist_classic/res/dropuser.cur b/src/core/stdclist/res/dropuser.cur
index a84b19e28b..a84b19e28b 100644
--- a/plugins/Clist_classic/res/dropuser.cur
+++ b/src/core/stdclist/res/dropuser.cur
diff --git a/plugins/Clist_classic/res/hyperlin.cur b/src/core/stdclist/res/hyperlin.cur
index f0f548c828..f0f548c828 100644
--- a/plugins/Clist_classic/res/hyperlin.cur
+++ b/src/core/stdclist/res/hyperlin.cur
diff --git a/plugins/Clist_classic/res/resource.rc b/src/core/stdclist/res/resource.rc
index 1db5646b80..1db5646b80 100644
--- a/plugins/Clist_classic/res/resource.rc
+++ b/src/core/stdclist/res/resource.rc
diff --git a/plugins/Clist_classic/res/version.rc b/src/core/stdclist/res/version.rc
index 73ab32afe8..73ab32afe8 100644
--- a/plugins/Clist_classic/res/version.rc
+++ b/src/core/stdclist/res/version.rc
diff --git a/plugins/Clist_classic/src/clc.h b/src/core/stdclist/src/clc.h
index d089a213da..d089a213da 100644
--- a/plugins/Clist_classic/src/clc.h
+++ b/src/core/stdclist/src/clc.h
diff --git a/plugins/Clist_classic/src/clcfonts.cpp b/src/core/stdclist/src/clcfonts.cpp
index 6a2f3062dc..6a2f3062dc 100644
--- a/plugins/Clist_classic/src/clcfonts.cpp
+++ b/src/core/stdclist/src/clcfonts.cpp
diff --git a/plugins/Clist_classic/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index 51f9c8a08b..51f9c8a08b 100644
--- a/plugins/Clist_classic/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
diff --git a/plugins/Clist_classic/src/clcpaint.cpp b/src/core/stdclist/src/clcpaint.cpp
index dfa4147244..dfa4147244 100644
--- a/plugins/Clist_classic/src/clcpaint.cpp
+++ b/src/core/stdclist/src/clcpaint.cpp
diff --git a/plugins/Clist_classic/src/clistmenus.cpp b/src/core/stdclist/src/clistmenus.cpp
index 76be7e93e4..76be7e93e4 100644
--- a/plugins/Clist_classic/src/clistmenus.cpp
+++ b/src/core/stdclist/src/clistmenus.cpp
diff --git a/plugins/Clist_classic/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index 83079d6d75..83079d6d75 100644
--- a/plugins/Clist_classic/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
diff --git a/plugins/Clist_classic/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp
index e0b7bdbdee..e0b7bdbdee 100644
--- a/plugins/Clist_classic/src/cluiopts.cpp
+++ b/src/core/stdclist/src/cluiopts.cpp
diff --git a/plugins/Clist_classic/src/commonheaders.h b/src/core/stdclist/src/commonheaders.h
index 11522da792..11522da792 100644
--- a/plugins/Clist_classic/src/commonheaders.h
+++ b/src/core/stdclist/src/commonheaders.h
diff --git a/plugins/Clist_classic/src/init.cpp b/src/core/stdclist/src/init.cpp
index dc09abd4ef..60b3bae86e 100644
--- a/plugins/Clist_classic/src/init.cpp
+++ b/src/core/stdclist/src/init.cpp
@@ -58,16 +58,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID reserved)
 

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

-	"Classic contact list",

-	__VERSION_DWORD,

-	"Display contacts, event notifications, protocol status.",

-	"Miranda IM project",

-	"ghazan@miranda-im.org",

-	"Copyright 2000-2008 Miranda IM project",

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

+	__PLUGIN_NAME,

+	MIRANDA_VERSION_DWORD,

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

 	//{240A91DC-9464-457a-9787-FF1EA88E77E3}

-    {0x240a91dc, 0x9464, 0x457a, { 0x97, 0x87, 0xff, 0x1e, 0xa8, 0x8e, 0x77, 0xe3 }} 

+    {0x240a91dc, 0x9464, 0x457a, { 0x97, 0x87, 0xff, 0x1e, 0xa8, 0x8e, 0x77, 0xe3 }}

 };

 

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

diff --git a/plugins/Clist_classic/src/resource.h b/src/core/stdclist/src/resource.h
index 541c69b212..541c69b212 100644
--- a/plugins/Clist_classic/src/resource.h
+++ b/src/core/stdclist/src/resource.h
diff --git a/src/core/stdclist/src/version.h b/src/core/stdclist/src/version.h
new file mode 100644
index 0000000000..e8d5e9b5e7
--- /dev/null
+++ b/src/core/stdclist/src/version.h
@@ -0,0 +1,14 @@
+

+#include <m_version.h>

+

+#define __FILEVERSION_STRING		MIRANDA_VERSION_FILEVERSION

+#define __VERSION_STRING			MIRANDA_VERSION_STRING

+

+#define __PLUGIN_NAME				"Classic contact list"

+#define __INTERNAL_NAME				"stdclist"

+#define __FILENAME					"stdclist.dll"

+#define __DESCRIPTION 				"Core module for displaying contacts."

+#define __AUTHOR                 "Miranda NG Development Team"

+#define __AUTHOREMAIL				""

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

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/src/core/stdemail/version.h b/src/core/stdemail/version.h
index c31cb1194e..46b2087c41 100644
--- a/src/core/stdemail/version.h
+++ b/src/core/stdemail/version.h
@@ -8,7 +8,7 @@
 #define __INTERNAL_NAME				"stdemail"

 #define __FILENAME					"stdemail.dll"

 #define __DESCRIPTION 				"Core module for e-mail urls handling."

-#define __AUTHOR                 "Myranda team"

+#define __AUTHOR                 "Miranda NG Development Team"

 #define __AUTHOREMAIL				""

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

-#define __COPYRIGHT					"© 2012 Myranda team"

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/src/core/stdfile/version.h b/src/core/stdfile/version.h
index c7b2e9f028..6e47a11cef 100644
--- a/src/core/stdfile/version.h
+++ b/src/core/stdfile/version.h
@@ -8,7 +8,7 @@
 #define __INTERNAL_NAME				"stdfile"

 #define __FILENAME					"stdfile.dll"

 #define __DESCRIPTION 				"Core module for sending/receiving files."

-#define __AUTHOR                 "Myranda team"

+#define __AUTHOR                 "Miranda NG Development Team"

 #define __AUTHOREMAIL				""

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

-#define __COPYRIGHT					"© 2012 Myranda team"

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/src/core/stdhelp/version.h b/src/core/stdhelp/version.h
index 93104688aa..1bd1020583 100644
--- a/src/core/stdhelp/version.h
+++ b/src/core/stdhelp/version.h
@@ -8,7 +8,7 @@
 #define __INTERNAL_NAME				"stdhelp"

 #define __FILENAME					"stdhelp.dll"

 #define __DESCRIPTION 				"Core module for the Help/About dialog."

-#define __AUTHOR                 "Myranda team"

+#define __AUTHOR                 "Miranda NG Development Team"

 #define __AUTHOREMAIL				""

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

-#define __COPYRIGHT					"© 2012 Myranda team"

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/src/core/stdidle/version.h b/src/core/stdidle/version.h
index e38c89285c..fb382d83db 100644
--- a/src/core/stdidle/version.h
+++ b/src/core/stdidle/version.h
@@ -8,7 +8,7 @@
 #define __INTERNAL_NAME				"stdidle"

 #define __FILENAME					"stdidle.dll"

 #define __DESCRIPTION 				"Core module for idle state processing."

-#define __AUTHOR                 "Myranda team"

+#define __AUTHOR                 "Miranda NG Development Team"

 #define __AUTHOREMAIL				""

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

-#define __COPYRIGHT					"© 2012 Myranda team"

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/plugins/SRMM/docs/srmm-license.txt b/src/core/stdmsg/docs/srmm-license.txt
index ca3fe8d547..ca3fe8d547 100644
--- a/plugins/SRMM/docs/srmm-license.txt
+++ b/src/core/stdmsg/docs/srmm-license.txt
diff --git a/plugins/SRMM/docs/srmm-readme.txt b/src/core/stdmsg/docs/srmm-readme.txt
index d53888eb88..d53888eb88 100644
--- a/plugins/SRMM/docs/srmm-readme.txt
+++ b/src/core/stdmsg/docs/srmm-readme.txt
diff --git a/plugins/SRMM/docs/srmm-translation.txt b/src/core/stdmsg/docs/srmm-translation.txt
index 95e4acd75e..95e4acd75e 100644
--- a/plugins/SRMM/docs/srmm-translation.txt
+++ b/src/core/stdmsg/docs/srmm-translation.txt
diff --git a/plugins/SRMM/res/dragcopy.cur b/src/core/stdmsg/res/dragcopy.cur
index 89c7c960d5..89c7c960d5 100644
--- a/plugins/SRMM/res/dragcopy.cur
+++ b/src/core/stdmsg/res/dragcopy.cur
diff --git a/plugins/SRMM/res/dropuser.cur b/src/core/stdmsg/res/dropuser.cur
index a84b19e28b..a84b19e28b 100644
--- a/plugins/SRMM/res/dropuser.cur
+++ b/src/core/stdmsg/res/dropuser.cur
diff --git a/plugins/SRMM/res/hyperlin.cur b/src/core/stdmsg/res/hyperlin.cur
index f0f548c828..f0f548c828 100644
--- a/plugins/SRMM/res/hyperlin.cur
+++ b/src/core/stdmsg/res/hyperlin.cur
diff --git a/plugins/SRMM/res/incoming.ico b/src/core/stdmsg/res/incoming.ico
index fabbf979cc..fabbf979cc 100644
--- a/plugins/SRMM/res/incoming.ico
+++ b/src/core/stdmsg/res/incoming.ico
diff --git a/plugins/SRMM/res/notice.ico b/src/core/stdmsg/res/notice.ico
index 23527a94d8..23527a94d8 100644
--- a/plugins/SRMM/res/notice.ico
+++ b/src/core/stdmsg/res/notice.ico
diff --git a/plugins/SRMM/res/outgoing.ico b/src/core/stdmsg/res/outgoing.ico
index f772ab3f8d..f772ab3f8d 100644
--- a/plugins/SRMM/res/outgoing.ico
+++ b/src/core/stdmsg/res/outgoing.ico
diff --git a/plugins/SRMM/res/resource.rc b/src/core/stdmsg/res/resource.rc
index 2191538b6f..2191538b6f 100644
--- a/plugins/SRMM/res/resource.rc
+++ b/src/core/stdmsg/res/resource.rc
diff --git a/plugins/SRMM/res/version.rc b/src/core/stdmsg/res/version.rc
index 9b4b853e11..9b4b853e11 100644
--- a/plugins/SRMM/res/version.rc
+++ b/src/core/stdmsg/res/version.rc
diff --git a/plugins/SRMM/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp
index 91d082fc74..91d082fc74 100644
--- a/plugins/SRMM/src/cmdlist.cpp
+++ b/src/core/stdmsg/src/cmdlist.cpp
diff --git a/plugins/SRMM/src/cmdlist.h b/src/core/stdmsg/src/cmdlist.h
index add3d4987b..add3d4987b 100644
--- a/plugins/SRMM/src/cmdlist.h
+++ b/src/core/stdmsg/src/cmdlist.h
diff --git a/plugins/SRMM/src/commonheaders.h b/src/core/stdmsg/src/commonheaders.h
index 5ab3a6985d..5ab3a6985d 100644
--- a/plugins/SRMM/src/commonheaders.h
+++ b/src/core/stdmsg/src/commonheaders.h
diff --git a/plugins/SRMM/src/globals.cpp b/src/core/stdmsg/src/globals.cpp
index e6d0175f1c..e6d0175f1c 100644
--- a/plugins/SRMM/src/globals.cpp
+++ b/src/core/stdmsg/src/globals.cpp
diff --git a/plugins/SRMM/src/globals.h b/src/core/stdmsg/src/globals.h
index 05ae138f7d..05ae138f7d 100644
--- a/plugins/SRMM/src/globals.h
+++ b/src/core/stdmsg/src/globals.h
diff --git a/plugins/SRMM/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index df25b409e0..df25b409e0 100644
--- a/plugins/SRMM/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
diff --git a/plugins/SRMM/src/msglog.cpp b/src/core/stdmsg/src/msglog.cpp
index d24cda4032..d24cda4032 100644
--- a/plugins/SRMM/src/msglog.cpp
+++ b/src/core/stdmsg/src/msglog.cpp
diff --git a/plugins/SRMM/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 6eb91e910f..6eb91e910f 100644
--- a/plugins/SRMM/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
diff --git a/plugins/SRMM/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp
index 9bf26a38cb..9bf26a38cb 100644
--- a/plugins/SRMM/src/msgs.cpp
+++ b/src/core/stdmsg/src/msgs.cpp
diff --git a/plugins/SRMM/src/msgs.h b/src/core/stdmsg/src/msgs.h
index 4a02e67a32..4a02e67a32 100644
--- a/plugins/SRMM/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
diff --git a/plugins/SRMM/src/msgtimedout.cpp b/src/core/stdmsg/src/msgtimedout.cpp
index 1b1773aa8e..1b1773aa8e 100644
--- a/plugins/SRMM/src/msgtimedout.cpp
+++ b/src/core/stdmsg/src/msgtimedout.cpp
diff --git a/plugins/SRMM/src/resource.h b/src/core/stdmsg/src/resource.h
index 715d83656b..715d83656b 100644
--- a/plugins/SRMM/src/resource.h
+++ b/src/core/stdmsg/src/resource.h
diff --git a/plugins/SRMM/src/richutil.cpp b/src/core/stdmsg/src/richutil.cpp
index 7f77c98fa8..7f77c98fa8 100644
--- a/plugins/SRMM/src/richutil.cpp
+++ b/src/core/stdmsg/src/richutil.cpp
diff --git a/plugins/SRMM/src/richutil.h b/src/core/stdmsg/src/richutil.h
index 68e9f37c5b..68e9f37c5b 100644
--- a/plugins/SRMM/src/richutil.h
+++ b/src/core/stdmsg/src/richutil.h
diff --git a/plugins/SRMM/src/srmm.cpp b/src/core/stdmsg/src/srmm.cpp
index 041152ee49..dfb4c31579 100644
--- a/plugins/SRMM/src/srmm.cpp
+++ b/src/core/stdmsg/src/srmm.cpp
@@ -30,13 +30,13 @@ TIME_API tmi;
 

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

-	"Send/Receive Messages",

-	__VERSION_DWORD,

-	"Send and receive instant messages",

-	"Miranda NG Development Team",

-	"rainwater@miranda-im.org",

-	"Copyright 2000-2012 Miranda IM project, 2012 Miranda NG project",

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

+	__PLUGIN_NAME,

+	MIRANDA_VERSION_DWORD,

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

 	{0x657fe89b, 0xd121, 0x40c2, { 0x8a, 0xc9, 0xb9, 0xfa, 0x57, 0x55, 0xb3, 0xc }} //{657FE89B-D121-40c2-8AC9-B9FA5755B30C}

 };

diff --git a/plugins/SRMM/src/statusicon.cpp b/src/core/stdmsg/src/statusicon.cpp
index cd7ac3872e..cd7ac3872e 100644
--- a/plugins/SRMM/src/statusicon.cpp
+++ b/src/core/stdmsg/src/statusicon.cpp
diff --git a/plugins/SRMM/src/statusicon.h b/src/core/stdmsg/src/statusicon.h
index 314ac9ec1e..314ac9ec1e 100644
--- a/plugins/SRMM/src/statusicon.h
+++ b/src/core/stdmsg/src/statusicon.h
diff --git a/src/core/stdmsg/src/version.h b/src/core/stdmsg/src/version.h
new file mode 100644
index 0000000000..4001e7f865
--- /dev/null
+++ b/src/core/stdmsg/src/version.h
@@ -0,0 +1,14 @@
+

+#include <m_version.h>

+

+#define __FILEVERSION_STRING		MIRANDA_VERSION_FILEVERSION

+#define __VERSION_STRING			MIRANDA_VERSION_STRING

+

+#define __PLUGIN_NAME				"Send/Receive Messages"

+#define __INTERNAL_NAME				"stdmsg"

+#define __FILENAME					"stdmsg.dll"

+#define __DESCRIPTION 				"Core module for send/receive instant messages."

+#define __AUTHOR                 "Miranda NG Development Team"

+#define __AUTHOREMAIL				""

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

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/plugins/SRMM/srmm_10.vcxproj b/src/core/stdmsg/srmm_10.vcxproj
index e68d5445a2..c985b94a9b 100644
--- a/plugins/SRMM/srmm_10.vcxproj
+++ b/src/core/stdmsg/srmm_10.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

-    <ProjectName>SRMM</ProjectName>

+    <ProjectName>StdMsg</ProjectName>

     <ProjectGuid>{F47EAB99-C78F-4A92-87D5-B0E16FE5A133}</ProjectGuid>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

@@ -59,13 +59,13 @@
   <PropertyGroup Label="UserMacros" />

   <PropertyGroup>

     <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Core\</OutDir>

     <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

     <IgnoreImportLibrary>true</IgnoreImportLibrary>

   </PropertyGroup>

@@ -74,7 +74,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

@@ -87,7 +87,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -106,7 +106,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <BufferSecurityCheck>false</BufferSecurityCheck>

@@ -119,7 +119,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

@@ -136,7 +136,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -150,7 +150,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

@@ -164,7 +164,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>false</StringPooling>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

@@ -177,7 +177,7 @@
     </ClCompile>

     <ResourceCompile>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\include;..\..\include\msapi</AdditionalIncludeDirectories>

+      <AdditionalIncludeDirectories>..\..\..\include;..\..\..\include\msapi</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

       <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/plugins/SRMM/srmm_10.vcxproj.filters b/src/core/stdmsg/srmm_10.vcxproj.filters
index 751ea7199a..751ea7199a 100644
--- a/plugins/SRMM/srmm_10.vcxproj.filters
+++ b/src/core/stdmsg/srmm_10.vcxproj.filters
diff --git a/src/core/stduihist/version.h b/src/core/stduihist/version.h
index 71226e8a50..99ff40c2e8 100644
--- a/src/core/stduihist/version.h
+++ b/src/core/stduihist/version.h
@@ -8,7 +8,7 @@
 #define __INTERNAL_NAME				"stduihist"

 #define __FILENAME					"stduihist.dll"

 #define __DESCRIPTION 				"Core module for built-in history viewer."

-#define __AUTHOR                 "Myranda team"

+#define __AUTHOR                 "Miranda NG Development Team"

 #define __AUTHOREMAIL				""

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

-#define __COPYRIGHT					"© 2012 Myranda team"

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/src/core/stdurl/version.h b/src/core/stdurl/version.h
index 40d6568a81..990f0452ab 100644
--- a/src/core/stdurl/version.h
+++ b/src/core/stdurl/version.h
@@ -8,7 +8,7 @@
 #define __INTERNAL_NAME				"stdurl"

 #define __FILENAME					"stdurl.dll"

 #define __DESCRIPTION 				"Core module for URL handling."

-#define __AUTHOR                 "Myranda team"

+#define __AUTHOR                 "Miranda NG Development Team"

 #define __AUTHOREMAIL				""

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

-#define __COPYRIGHT					"© 2012 Myranda team"

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/src/core/stduserinfo/version.h b/src/core/stduserinfo/version.h
index 64130a49e7..ca6347c294 100644
--- a/src/core/stduserinfo/version.h
+++ b/src/core/stduserinfo/version.h
@@ -8,7 +8,7 @@
 #define __INTERNAL_NAME				"stduserinfo"

 #define __FILENAME					"stduserinfo.dll"

 #define __DESCRIPTION 				"Core module for providing user information."

-#define __AUTHOR                 "Myranda team"

+#define __AUTHOR                 "Miranda NG Development Team"

 #define __AUTHOREMAIL				""

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

-#define __COPYRIGHT					"© 2012 Myranda team"

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/src/core/stduseronline/version.h b/src/core/stduseronline/version.h
index e81e85bd8f..fc0cc14144 100644
--- a/src/core/stduseronline/version.h
+++ b/src/core/stduseronline/version.h
@@ -8,7 +8,7 @@
 #define __INTERNAL_NAME				"stduseronline"

 #define __FILENAME					"stduseronline.dll"

 #define __DESCRIPTION 				"Core module for user-is-online event processing."

-#define __AUTHOR                 "Myranda team"

+#define __AUTHOR                 "Miranda NG Development Team"

 #define __AUTHOREMAIL				""

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

-#define __COPYRIGHT					"© 2012 Myranda team"

+#define __COPYRIGHT					"© 2012 Miranda NG Development Team"

diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index ad6206eaf4..684db5cb0c 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -40,26 +40,6 @@ LIST<pluginEntry>
 

 #define MAX_MIR_VER ULONG_MAX

 

-MuuidReplacement pluginDefault[] = 

-{

-	{	MIID_UIUSERINFO,      _T("stduserinfo"),   NULL },  // 0

-	{	MIID_SRURL,           _T("stdurl"),        NULL },  // 1

-	{	MIID_SREMAIL,         _T("stdemail"),      NULL },  // 2

-	{	MIID_SRAUTH,          _T("stdauth"),       NULL },  // 3

-	{	MIID_SRFILE,          _T("stdfile"),       NULL },  // 4

-	{	MIID_UIHELP,          _T("stdhelp"),       NULL },  // 5

-	{	MIID_UIHISTORY,       _T("stduihist"),     NULL },  // 6

-	{	MIID_IDLE,            _T("stdidle"),       NULL },  // 7

-	{	MIID_AUTOAWAY,        _T("stdautoaway"),   NULL },  // 8

-	{	MIID_USERONLINE,      _T("stduseronline"), NULL },  // 9

-	{	MIID_SRAWAY,          _T("stdaway"),       NULL },  // 10

-

-	{	MIID_CLIST,           NULL,   NULL },  // 11

-	{	MIID_CHAT,            NULL,   NULL },  // 12

-	{	MIID_SRMM,            NULL,   NULL },  // 13

-	{	MIID_DATABASE,        NULL,   NULL },  // 14

-};

-

 static BOOL bModuleInitialized = FALSE;

 

 TCHAR  mirandabootini[MAX_PATH];

@@ -101,6 +81,27 @@ bool hasMuuid(const BASIC_PLUGIN_INFO& bpi, const MUUID& uuid)
 	return false;

 }

 

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

+// default plugins

+

+static MuuidReplacement pluginDefault[] = 

+{

+	{	MIID_UIUSERINFO,      _T("stduserinfo"),   NULL },  // 0

+	{	MIID_SRURL,           _T("stdurl"),        NULL },  // 1

+	{	MIID_SREMAIL,         _T("stdemail"),      NULL },  // 2

+	{	MIID_SRAUTH,          _T("stdauth"),       NULL },  // 3

+	{	MIID_SRFILE,          _T("stdfile"),       NULL },  // 4

+	{	MIID_UIHELP,          _T("stdhelp"),       NULL },  // 5

+	{	MIID_UIHISTORY,       _T("stduihist"),     NULL },  // 6

+	{	MIID_IDLE,            _T("stdidle"),       NULL },  // 7

+	{	MIID_AUTOAWAY,        _T("stdautoaway"),   NULL },  // 8

+	{	MIID_USERONLINE,      _T("stduseronline"), NULL },  // 9

+	{	MIID_SRAWAY,          _T("stdaway"),       NULL },  // 10

+	{	MIID_CLIST,           _T("stdclist"),      NULL },  // 11

+	{	MIID_CHAT,            _T("stdchat"),       NULL },  // 12

+	{	MIID_SRMM,            _T("stdmsg"),        NULL }   // 13

+};

+

 int getDefaultPluginIdx(const MUUID& muuid)

 {

 	for (int i=0; i < SIZEOF(pluginDefault); i++)

@@ -110,6 +111,18 @@ int getDefaultPluginIdx(const MUUID& muuid)
 	return -1;

 }

 

+int LoadStdPlugins()

+{

+	for (int i=0; i < SIZEOF(pluginDefault); i++) {

+		if ( pluginDefault[i].pImpl )

+			continue;

+

+		if ( !LoadCorePlugin(pluginDefault[i]))

+			return 1;

+	}

+	return 0;

+}

+

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

 // global functions

 

diff --git a/src/modules/plugins/plugins.h b/src/modules/plugins/plugins.h
index d7b4d9adce..72e3087f4a 100644
--- a/src/modules/plugins/plugins.h
+++ b/src/modules/plugins/plugins.h
@@ -78,8 +78,6 @@ struct MuuidReplacement
 	pluginEntry* pImpl; // replacement plugin

 };

 

-extern MuuidReplacement pluginDefault[];

-

 bool LoadCorePlugin( MuuidReplacement& );

 

 MUUID* GetPluginInterfaces(const TCHAR* ptszFileName, bool& bIsPlugin);
\ No newline at end of file