removed not used headers

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

15 files changed, 149 insertions, 331 deletions

diff --git a/plugins/Popup/src/m_hpp.h b/plugins/ExternalAPI/m_hpp.h
index 169b666209..169b666209 100644
--- a/plugins/Popup/src/m_hpp.h
+++ b/plugins/ExternalAPI/m_hpp.h
diff --git a/plugins/Popup/PopUp_10.vcxproj b/plugins/Popup/PopUp_10.vcxproj
index ca01474120..b740f6d421 100644
--- a/plugins/Popup/PopUp_10.vcxproj
+++ b/plugins/Popup/PopUp_10.vcxproj
@@ -181,7 +181,6 @@
   <ItemGroup>

     <ClCompile Include="src\actions.cpp" />

     <ClCompile Include="src\avatars.cpp" />

-    <ClCompile Include="src\avatars_flash.cpp" />

     <ClCompile Include="src\avatars_gif.cpp" />

     <ClCompile Include="src\avatars_simple.cpp" />

     <ClCompile Include="src\bitmap_funcs.cpp" />

@@ -189,7 +188,6 @@
     <ClCompile Include="src\effects.cpp" />

     <ClCompile Include="src\font.cpp" />

     <ClCompile Include="src\formula.cpp" />

-    <ClCompile Include="src\headers.cpp" />

     <ClCompile Include="src\history.cpp" />

     <ClCompile Include="src\icons.cpp" />

     <ClCompile Include="src\stdafx.cpp">

diff --git a/plugins/Popup/PopUp_10.vcxproj.filters b/plugins/Popup/PopUp_10.vcxproj.filters
index 4003792550..32715e3773 100644
--- a/plugins/Popup/PopUp_10.vcxproj.filters
+++ b/plugins/Popup/PopUp_10.vcxproj.filters
@@ -24,9 +24,6 @@
     <ClCompile Include="src\avatars.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\avatars_flash.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\avatars_gif.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -48,9 +45,6 @@
     <ClCompile Include="src\formula.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\headers.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\history.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/plugins/Popup/PopUp_11.vcxproj b/plugins/Popup/PopUp_11.vcxproj
index a67afecea5..b8c7d231f1 100644
--- a/plugins/Popup/PopUp_11.vcxproj
+++ b/plugins/Popup/PopUp_11.vcxproj
@@ -185,7 +185,6 @@
   <ItemGroup>

     <ClCompile Include="src\actions.cpp" />

     <ClCompile Include="src\avatars.cpp" />

-    <ClCompile Include="src\avatars_flash.cpp" />

     <ClCompile Include="src\avatars_gif.cpp" />

     <ClCompile Include="src\avatars_simple.cpp" />

     <ClCompile Include="src\bitmap_funcs.cpp" />

@@ -193,7 +192,6 @@
     <ClCompile Include="src\effects.cpp" />

     <ClCompile Include="src\font.cpp" />

     <ClCompile Include="src\formula.cpp" />

-    <ClCompile Include="src\headers.cpp" />

     <ClCompile Include="src\history.cpp" />

     <ClCompile Include="src\icons.cpp" />

     <ClCompile Include="src\stdafx.cpp">

diff --git a/plugins/Popup/PopUp_11.vcxproj.filters b/plugins/Popup/PopUp_11.vcxproj.filters
index 4003792550..32715e3773 100644
--- a/plugins/Popup/PopUp_11.vcxproj.filters
+++ b/plugins/Popup/PopUp_11.vcxproj.filters
@@ -24,9 +24,6 @@
     <ClCompile Include="src\avatars.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\avatars_flash.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\avatars_gif.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

@@ -48,9 +45,6 @@
     <ClCompile Include="src\formula.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\headers.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\history.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/plugins/Popup/res/resource.rc b/plugins/Popup/res/resource.rc
index 8d153637e9..ab91abc370 100644
--- a/plugins/Popup/res/resource.rc
+++ b/plugins/Popup/res/resource.rc
@@ -7,7 +7,7 @@
 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

-#include "winres.h"

+#include "afxres.h"

 

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

 #undef APSTUDIO_READONLY_SYMBOLS

@@ -319,25 +319,6 @@ END
 

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

 //

-// Dialog Info

-//

-

-IDD_OPT_NOTIFICATIONS DLGINIT

-BEGIN

-    IDC_LACTION, 0x403, 13, 0

-0x6553, 0x646e, 0x4d20, 0x7365, 0x6173, 0x6567, "\000" 

-    IDC_LACTION, 0x403, 14, 0

-0x6944, 0x6d73, 0x7369, 0x2073, 0x6f50, 0x7570, 0x0070, 

-    IDC_RACTION, 0x403, 13, 0

-0x6553, 0x646e, 0x4d20, 0x7365, 0x6173, 0x6567, "\000" 

-    IDC_RACTION, 0x403, 14, 0

-0x6944, 0x6d73, 0x7369, 0x2073, 0x6f50, 0x7570, 0x0070, 

-    0

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

 // SKIN

 //

 

@@ -365,19 +346,8 @@ BEGIN
 END

 #endif    // APSTUDIO_INVOKED

 

-#endif    // Нейтральный resources

-/////////////////////////////////////////////////////////////////////////////

-

 

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

-// Итальянский (Италия) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)

-LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN

-#pragma code_page(1252)

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

 //

 // TEXTINCLUDE

 //

@@ -399,9 +369,7 @@ BEGIN
     "\0"

 END

 

-#endif    // APSTUDIO_INVOKED

-

-#endif    // Итальянский (Италия) resources

+#endif    // Нейтральный resources

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

 

 

diff --git a/plugins/Popup/res/version.rc b/plugins/Popup/res/version.rc
index daf17e8058..5bfbab4754 100644
--- a/plugins/Popup/res/version.rc
+++ b/plugins/Popup/res/version.rc
@@ -1,44 +1,38 @@
+// Microsoft Visual C++ generated resource script.

+//

 #ifdef APSTUDIO_INVOKED

 #error this file is not editable by Microsoft Visual C++

 #endif //APSTUDIO_INVOKED

 

-#include <windows.h> // include for version info constants

+#include "afxres.h"

 #include "..\src\version.h"

 

-//

-// TO CHANGE VERSION INFORMATION, EDIT PROJECT OPTIONS...

-//

 VS_VERSION_INFO VERSIONINFO

- FILEVERSION	__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

- PRODUCTVERSION	__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

- FILEFLAGSMASK 0x3fL

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

 #ifdef _DEBUG

- FILEFLAGS 0x21L

+ FILEFLAGS 0x1L

 #else

- FILEFLAGS 0x20L

+ FILEFLAGS 0x0L

 #endif

  FILEOS 0x4L

- FILETYPE 0x2L

+ FILETYPE 0x0L

  FILESUBTYPE 0x0L

 BEGIN

     BLOCK "StringFileInfo"

     BEGIN

         BLOCK "000004b0"

         BEGIN

-            VALUE "Comments", POPUP_DESCRIPTION

-            VALUE "CompanyName", "MPK"

-            VALUE "FileDescription", "Popup Plus plugin for Miranda NG"

-            VALUE "FileVersion", __VERSION_STRING_DOT

-            VALUE "InternalName", MODULNAME

-            VALUE "LegalCopyright", POPUP_COPYRIGHT

-            VALUE "OriginalFilename", POPUP_FILENAME

-            VALUE "ProductName", POPUP_DISPLAYNAME

-            VALUE "ProductVersion", __VERSION_STRING_DOT

-	END

-  END

-  BLOCK "VarFileInfo"

-  BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

         VALUE "Translation", 0x0, 1200

     END

 END

-

diff --git a/plugins/Popup/src/avatars_flash.cpp b/plugins/Popup/src/avatars_flash.cpp
deleted file mode 100644
index 7741b9494f..0000000000
--- a/plugins/Popup/src/avatars_flash.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*

-Popup Plus plugin for Miranda IM

-

-Copyright	© 2002 Luca Santarelli,

-			© 2004-2007 Victor Pavlychko

-			© 2010 MPK

-			© 2010 Merlin_de

-

-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.

-

-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, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#include "headers.h"

-

diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp
index 450c2367a3..1b0ecaee13 100644
--- a/plugins/Popup/src/config.cpp
+++ b/plugins/Popup/src/config.cpp
@@ -51,14 +51,15 @@ POPUPOPTIONS PopUpOptions;
 PLUGININFOEX pluginInfoEx =

 {

 	sizeof(PLUGININFOEX),

-	POPUP_DISPLAYNAME,

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

-	POPUP_DESCRIPTION,

-	POPUP_AUTHOR,

-	POPUP_EMAIL,

-	POPUP_COPYRIGHT,

-	POPUP_WEBPAGE,

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

+	// {26A9125D-7863-4E01-AF0E-D14EF95C5054}

 	{0x26a9125d, 0x7863, 0x4e01, {0xaf, 0xe, 0xd1, 0x4e, 0xf9, 0x5c, 0x50, 0x54}}

 };

 

diff --git a/plugins/Popup/src/font.h b/plugins/Popup/src/font.h
index 784118d366..13674ddd2b 100644
--- a/plugins/Popup/src/font.h
+++ b/plugins/Popup/src/font.h
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 //basic constants for all popup plugins

 #define PU_FNT_AND_COLOR		"Popups"			//common main group for customice\font&color

-#define PU_FNT_AND_COLOR_DB		PU_COMMONMODUL		//use eg strcpy(fid.dbSettingsGroup, PU_FNT_GROUP_DB);

+#define PU_FNT_AND_COLOR_DB		MODULNAME		//use eg strcpy(fid.dbSettingsGroup, PU_FNT_GROUP_DB);

 

 #define PU_FNT_PREFIX			"fnt%s"				//use eg mir_snprintf(fid.prefix, sizeof(fid.prefix), PU_FNT_PREFIX, PU_FNT_NAME_....);

 #define PU_FNT_NAME_TITLE		"Title"				//use eg lstrcpy(fid.name, _T(FNT_NAME_....)) for FontIDT

diff --git a/plugins/Popup/src/headers.cpp b/plugins/Popup/src/headers.cpp
deleted file mode 100644
index 7741b9494f..0000000000
--- a/plugins/Popup/src/headers.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/*

-Popup Plus plugin for Miranda IM

-

-Copyright	© 2002 Luca Santarelli,

-			© 2004-2007 Victor Pavlychko

-			© 2010 MPK

-			© 2010 Merlin_de

-

-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.

-

-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, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#include "headers.h"

-

diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h
index 3575b8c3c7..4c85cd85d7 100644
--- a/plugins/Popup/src/headers.h
+++ b/plugins/Popup/src/headers.h
@@ -46,122 +46,89 @@ http://miranda-ng.org/distr/
 #ifndef HEADERS_H

 #define HEADERS_H

 

-	// disable security warnings about "*_s" functions

-	#define _CRT_SECURE_NO_DEPRECATE

-

-	// disable warnings about underscore in stdc functions

-	#pragma warning(disable: 4996)

-

-	#define _WIN32_WINNT 0x0501

-	#define WINVER 0x0500

-	#define OEMRESOURCE

-

-	#include <windows.h>

-	#include <windowsx.h>

-	#include <winuser.h>

-

-	//Standard headers

-	#include <stdlib.h>

-	#include <stdio.h>

-	#include <time.h>

-	#include <malloc.h>

-

-	//Windows headers

-	#include <process.h>

-	#include <commctrl.h>

-	#include <commdlg.h>

-

-#ifdef ComboBox_SelectItemData

- // use Workaround for MS bug ComboBox_SelectItemData;

- #undef ComboBox_SelectItemData

-#endif

-

-	//Resources

-	#include "resource.h"

-

-	#define NOWIN2K

-	#define MIRANDA_VER 0x0A00

-

-	//Miranda API (see Miranda svn)

-	#include <newpluginapi.h>

-	#include <win2k.h>

-	#include <m_system.h>

-	#include <m_clui.h>

-	#include <m_clist.h>

-	#include <m_options.h>

-	#include <m_skin.h>

-	#include <m_langpack.h>

-	#include <m_database.h>

-		#undef DBGetContactSettingString

-	#include <m_protocols.h>

-	#include <m_protosvc.h>

-	#include <m_utils.h>

-	#include <m_button.h>

-	#include <m_message.h>

-	#include <m_userinfo.h>

-	#include <m_addcontact.h>

-	#include <m_png.h>

-	#include <m_clc.h>

-	#include <m_icolib.h>

-	#include <m_hotkeys.h>

-	#include <m_fontservice.h>

-	#include <m_avatars.h>

-	#include <m_metacontacts.h>

-	#include <m_extraicons.h>

-

-	#include <m_system_cpp.h>

-

-

-	// API for 3rd party plugins (\include_API folder)

- 	// this folder contain always the latest API

-	#include <m_folders.h>

-	#include <m_ieview.h>

-	#include <m_smileyadd.h>

-	#ifndef MTEXT_NOHELPERS

-		#define MTEXT_NOHELPERS

-	#endif // MTEXT_NOHELPERS

-	#include <m_text.h>

-	#include <m_toptoolbar.h>

-	#include <m_popup.h>			//core define see miranda\include\

-

-	// API for 3rd party plugins (.\api folder)

-	// this folder contain spetial edition API (not latest API !!!)

-	#include "m_mathmodule.h"

-	#include "m_popup2.h"

-

-	//PopUp common handlers

-	#include "defs.h"

-	#include "version.h"

-	#include "config.h"

-	#include "common.h"

-	#include "def_settings.h"

-	#include "opttree.h"

-	#include "opt_gen.h"

-	#include "opt_skins.h"

-	#include "opt_contacts.h"

-	#include "opt_adv.h"

-	#include "m_hpp.h"

-	#include "history.h"

-	#include "services.h"

-	#include "srmm_menu.h"

-	#include "bitmap_funcs.h"

-	#include "icons.h"

-	#include "font.h"

-	#include "formula.h"

-	#include "skin.h"

-	#include "popup_thread.h"

-	#include "actions.h"

-	#include "notifications.h"

-	#include "opt_class.h"

-	#include "popup_wnd2.h"

-	#include "effects.h"

-

-	#include "avatars.h"

-	#include "avatars_simple.h"

-	#include "avatars_flash.h"

-	#include "avatars_gif.h"

-

-	#include "popup_gdiplus.h"

+// disable security warnings about "*_s" functions

+#define _CRT_SECURE_NO_DEPRECATE

+

+#define _WIN32_WINNT 0x0501

+#define WINVER 0x0500

+#define OEMRESOURCE

+

+#include <windows.h>

+#include <windowsx.h>

+#include <time.h>

+#include <process.h>

+#include <commctrl.h>

+

+#include <newpluginapi.h>

+#include <win2k.h>

+#include <m_clui.h>

+#include <m_clist.h>

+#include <m_options.h>

+#include <m_skin.h>

+#include <m_langpack.h>

+#include <m_database.h>

+#undef DBGetContactSettingString

+#include <m_protosvc.h>

+#include <m_button.h>

+#include <m_message.h>

+#include <m_userinfo.h>

+#include <m_addcontact.h>

+#include <m_png.h>

+#include <m_clc.h>

+#include <m_icolib.h>

+#include <m_hotkeys.h>

+#include <m_fontservice.h>

+#include <m_avatars.h>

+#include <m_extraicons.h>

+#include <m_popup.h>

+

+#include <m_metacontacts.h>

+#include <m_folders.h>

+#include <m_ieview.h>

+#include <m_smileyadd.h>

+#ifndef MTEXT_NOHELPERS

+	#define MTEXT_NOHELPERS

+#endif // MTEXT_NOHELPERS

+#include <m_text.h>

+#include <m_toptoolbar.h>

+#include <m_popup2.h>

+#include <m_hpp.h>

+

+#include "resource.h"

+#include "defs.h"

+#include "version.h"

+#include "config.h"

+#include "common.h"

+#include "def_settings.h"

+#include "opttree.h"

+#include "opt_gen.h"

+#include "opt_skins.h"

+#include "opt_contacts.h"

+#include "opt_adv.h"

+#include "history.h"

+#include "services.h"

+#include "srmm_menu.h"

+#include "bitmap_funcs.h"

+#include "icons.h"

+#include "font.h"

+#include "formula.h"

+#include "skin.h"

+#include "popup_thread.h"

+#include "actions.h"

+#include "notifications.h"

+#include "opt_class.h"

+#include "popup_wnd2.h"

+#include "effects.h"

+#include "avatars.h"

+#include "avatars_simple.h"

+#include "avatars_flash.h"

+#include "avatars_gif.h"

+#include "popup_gdiplus.h"

+

+#define PU_MODULCLASS				"PopUpCLASS"		//temp DB modul for this plugin

+#define MODULNAME					"PopUp"

+#define MODULNAME_LONG				"Popup Plus"		//dont use "PopUp Plus" coz notify register use "Popup Plus"

+#define MODULNAME_PLU				"PopUps"

 

 INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM);

 

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index edd2caf603..88cf04ceb4 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -389,37 +389,37 @@ MIRAPI int Load(void)
 

 	//Service Functions

 	CreateServiceFunction(MS_POPUP_ADDPOPUP,             PopUp_AddPopUp);

-   CreateServiceFunction(MS_POPUP_ADDPOPUPEX,           PopUp_AddPopUpEx);

-   CreateServiceFunction(MS_POPUP_ADDPOPUPW,            PopUp_AddPopUpW);

-   CreateServiceFunction(MS_POPUP_ADDPOPUP2,            PopUp_AddPopUp2);

+	CreateServiceFunction(MS_POPUP_ADDPOPUPEX,           PopUp_AddPopUpEx);

+	CreateServiceFunction(MS_POPUP_ADDPOPUPW,            PopUp_AddPopUpW);

+	CreateServiceFunction(MS_POPUP_ADDPOPUP2,            PopUp_AddPopUp2);

 

-   CreateServiceFunction(MS_POPUP_CHANGETEXT,           PopUp_ChangeText);

-   CreateServiceFunction(MS_POPUP_CHANGETEXTW,          PopUp_ChangeTextW);

-   CreateServiceFunction(MS_POPUP_CHANGE,               PopUp_Change);

-   CreateServiceFunction(MS_POPUP_CHANGEW,              PopUp_ChangeW);

-   CreateServiceFunction(MS_POPUP_CHANGEPOPUP2,         PopUp_Change2);

+	CreateServiceFunction(MS_POPUP_CHANGETEXT,           PopUp_ChangeText);

+	CreateServiceFunction(MS_POPUP_CHANGETEXTW,          PopUp_ChangeTextW);

+	CreateServiceFunction(MS_POPUP_CHANGE,               PopUp_Change);

+	CreateServiceFunction(MS_POPUP_CHANGEW,              PopUp_ChangeW);

+	CreateServiceFunction(MS_POPUP_CHANGEPOPUP2,         PopUp_Change2);

 

-   CreateServiceFunction(MS_POPUP_GETCONTACT,           PopUp_GetContact);

-   CreateServiceFunction(MS_POPUP_GETPLUGINDATA,        PopUp_GetPluginData);

-   CreateServiceFunction(MS_POPUP_ISSECONDLINESHOWN,    PopUp_IsSecondLineShown);

+	CreateServiceFunction(MS_POPUP_GETCONTACT,           PopUp_GetContact);

+	CreateServiceFunction(MS_POPUP_GETPLUGINDATA,        PopUp_GetPluginData);

+	CreateServiceFunction(MS_POPUP_ISSECONDLINESHOWN,    PopUp_IsSecondLineShown);

 

-   CreateServiceFunction(MS_POPUP_SHOWMESSAGE,          PopUp_ShowMessage);

-   CreateServiceFunction(MS_POPUP_SHOWMESSAGEW,         PopUp_ShowMessageW);

-   CreateServiceFunction(MS_POPUP_QUERY,                PopUp_Query);

+	CreateServiceFunction(MS_POPUP_SHOWMESSAGE,          PopUp_ShowMessage);

+	CreateServiceFunction(MS_POPUP_SHOWMESSAGEW,         PopUp_ShowMessageW);

+	CreateServiceFunction(MS_POPUP_QUERY,                PopUp_Query);

 

-   CreateServiceFunction(MS_POPUP_REGISTERACTIONS,      PopUp_RegisterActions);

-   CreateServiceFunction(MS_POPUP_REGISTERNOTIFICATION, PopUp_RegisterNotification);

+	CreateServiceFunction(MS_POPUP_REGISTERACTIONS,      PopUp_RegisterActions);

+	CreateServiceFunction(MS_POPUP_REGISTERNOTIFICATION, PopUp_RegisterNotification);

 

-   CreateServiceFunction(MS_POPUP_UNHOOKEVENTASYNC,     PopUp_UnhookEventAsync);

+	CreateServiceFunction(MS_POPUP_UNHOOKEVENTASYNC,     PopUp_UnhookEventAsync);

 

-   CreateServiceFunction(MS_POPUP_REGISTERVFX,          PopUp_RegisterVfx);

+	CreateServiceFunction(MS_POPUP_REGISTERVFX,          PopUp_RegisterVfx);

 

-   CreateServiceFunction(MS_POPUP_REGISTERCLASS,        PopUp_RegisterPopupClass);

-   CreateServiceFunction(MS_POPUP_ADDPOPUPCLASS,        PopUp_CreateClassPopup);

+	CreateServiceFunction(MS_POPUP_REGISTERCLASS,        PopUp_RegisterPopupClass);

+	CreateServiceFunction(MS_POPUP_ADDPOPUPCLASS,        PopUp_CreateClassPopup);

 

 	//load icons / create hook

 	InitIcons();

-	HookEvent(ME_SKIN2_ICONSCHANGED,IconsChanged);

+	HookEvent(ME_SKIN2_ICONSCHANGED, IconsChanged);

 	//add menu items

 	InitMenuItems();

 

diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp
index 858f990aae..e085c1f4ad 100644
--- a/plugins/Popup/src/services.cpp
+++ b/plugins/Popup/src/services.cpp
@@ -257,11 +257,11 @@ INT_PTR PopUp_AddPopUp2(WPARAM wParam, LPARAM lParam)
 		if (!PopUpOptions.ModuleIsEnabled)

 			return -1;

 		#ifdef _DEBUG

-			itoa(PopUpOptions.DisableWhenFullscreen,temp,10);

+			_itoa(PopUpOptions.DisableWhenFullscreen,temp,10);

 			OutputDebugStringA("PopUpOptions.DisableWhenFullscreen: \t");

 			OutputDebugStringA(temp);

 			OutputDebugStringA("\n");

-			itoa(bShowMode,temp,10);

+			_itoa(bShowMode,temp,10);

 			OutputDebugStringA("bShowMode: \t");

 			OutputDebugStringA(temp);

 			OutputDebugStringA("\n");

diff --git a/plugins/Popup/src/version.h b/plugins/Popup/src/version.h
index 64a7771ea6..116ad90225 100644
--- a/plugins/Popup/src/version.h
+++ b/plugins/Popup/src/version.h
@@ -1,60 +1,14 @@
-/*

-Popup Plus plugin for Miranda IM

-

-Copyright	пїЅ 2002 Luca Santarelli,

-			пїЅ 2004-2007 Victor Pavlychko

-			пїЅ 2010 MPK

-			пїЅ 2010 Merlin_de

-

-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.

-

-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, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-	#define PU_COMMONMODUL				"PopUp"				//common DB modul name for all Popup plugins

-	#define PU_MODULNAME				"PopUpPlus"			//DB modul for this plugin

-	#define PU_MODULCLASS				"PopUpCLASS"		//temp DB modul for this plugin

-	#define MODULNAME					"PopUp"

-	#define MODULNAME_LONG				"Popup Plus"		//dont use "PopUp Plus" coz notify register use "Popup Plus"

-	#define MODULNAME_PLU				"PopUps"

-

-	#define POPUP_FILENAME				"PopUp.dll"

-	#define POPUP_DISPLAYNAME			"PopUp Plus"

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

-	#define __FLVersionPrefix			"<span class=\"fileNameHeader\">PopUp Plus (Unicode) "

-	#define __FLUpdateURL				"http://miranda-ng.org/distr/x32/Plugins/popup.zip"			//.zip

-	#define __BetaUpdateURL				""

-

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

-	#define __BetaVersionPrefix			"beta: "

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

-

-	#define __MAJOR_VERSION				2

-	#define __MINOR_VERSION				1

-	#define __RELEASE_NUM				1

-	#define __BUILD_NUM					6

-

-	#define __STRINGIFY(x)				#x

-	#define __STRINGIFY2(x)				__STRINGIFY(x)

-	#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

-	#define __FILEVERSION_STRING_DOTS	__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

-

-	#define __VERSION_STRING			__STRINGIFY2(__FILEVERSION_STRING)

-	#define __VERSION_STRING_DOT		__STRINGIFY2(__FILEVERSION_STRING_DOTS)

-

-	#define POPUP_DESCRIPTION	"Provides popup notification services for different plugins."

-	#define POPUP_AUTHOR		"MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)"

-	#define POPUP_EMAIL			"mp-king@web.de"

-	#define POPUP_COPYRIGHT		"пїЅ2002 Luca Santarelli, пїЅ2004-2007 Victor Pavlychko, пїЅ2010 MPK, Merlin_de"

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

-	#define POPUP_PID			0x12a3fdbdecd273ee67dbc4d6d00e9268

-

+#define __MAJOR_VERSION				2

+#define __MINOR_VERSION				1

+#define __RELEASE_NUM				1

+#define __BUILD_NUM					6

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+

+#define __PLUGIN_NAME				"PopUp plus"

+#define __FILENAME					"PopUp.dll"

+#define __DESCRIPTION 				"Provides popup notification services for different plugins."

+#define __AUTHOR					"MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)"

+#define __AUTHOREMAIL				"mp-king@web.de"

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

+#define __COPYRIGHT					"© 2002 Luca Santarelli, 2004-2007 Victor Pavlychko, 2010 MPK, Merlin_de"