added precompiled header

added version info

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

25 files changed, 108 insertions, 204 deletions

diff --git a/plugins/YAMN/src/YAMNopts.cpp b/plugins/YAMN/src/YAMNopts.cpp
deleted file mode 100644
index 99a8091366..0000000000
--- a/plugins/YAMN/src/YAMNopts.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-

-

diff --git a/plugins/YAMN/src/account.cpp b/plugins/YAMN/src/account.cpp
index 76b653a4b7..0a82e05305 100644
--- a/plugins/YAMN/src/account.cpp
+++ b/plugins/YAMN/src/account.cpp
@@ -7,10 +7,6 @@
  */

 

 #include "yamn.h"

-#include "m_mails.h"

-#if defined(DEBUG_FILEREAD) || defined(DEBUG_FILEREADMESSAGES) || defined(DEBUG_SYNCHRO)

-	#include <stdio.h>

-#endif

 

 //Account status CS

 //When we check some account, thread should change status of account to idle, connecting etc.

diff --git a/plugins/YAMN/src/browser/badconnect.cpp b/plugins/YAMN/src/browser/badconnect.cpp
index faa9b9ba07..2c0f9b65e5 100644
--- a/plugins/YAMN/src/browser/badconnect.cpp
+++ b/plugins/YAMN/src/browser/badconnect.cpp
@@ -4,8 +4,7 @@
  * (c) majvan 2002,2004

  */

 

-#include "../yamn.h"

-#include "../main.h"

+#include "..\yamn.h"

 

 #define BADCONNECTTITLE LPGEN("%s - connection error")

 #define BADCONNECTMSG LPGEN("An error occured. Error code: %d")//is in use?

diff --git a/plugins/YAMN/src/browser/m_browser.h b/plugins/YAMN/src/browser/browser.h
index 8b05e3d84a..18ec0f385e 100644
--- a/plugins/YAMN/src/browser/m_browser.h
+++ b/plugins/YAMN/src/browser/browser.h
@@ -1,9 +1,6 @@
 #ifndef __MAILBROWSER_H

 #define __MAILBROWSER_H

 

-#include "m_account.h"

-#include "../debug.h"

-

 typedef struct MailBrowserWinParam

 {

 #define YAMN_MAILBROWSERVERSION	1

diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp
index 0a79b2be62..09afbb815d 100644
--- a/plugins/YAMN/src/browser/mailbrowser.cpp
+++ b/plugins/YAMN/src/browser/mailbrowser.cpp
@@ -9,15 +9,8 @@
  * When you got errors, try to comment the #define <stdio.h> and compile, then

  * put it back to uncommented and compile again :)

  */

-#ifndef _WIN32_IE

-	#define _WIN32_IE 0x0400

-#endif

-#ifndef _WIN32_WINNT

-	#define _WIN32_WINNT 0x0501

-#endif

 

 #include "../yamn.h" 

-#include "../main.h" 

 

 #define	TIMER_FLASHING 0x09061979

 #define MAILBROWSER_MINXSIZE	200		//min size of mail browser window

diff --git a/plugins/YAMN/src/debug.cpp b/plugins/YAMN/src/debug.cpp
index 9b9793a965..1f19975586 100644
--- a/plugins/YAMN/src/debug.cpp
+++ b/plugins/YAMN/src/debug.cpp
@@ -8,17 +8,8 @@
  */

 

 #include "yamn.h"

-#include "debug.h"

-#ifdef YAMN_DEBUG

-#include "version.h"

-

-#if defined (WIN9X)

-	#define YAMN_VER	"YAMN " YAMN_VERSION_C " (Win9x)"

-#elif defined(WIN2IN1)

-	#define YAMN_VER	"YAMN " YAMN_VERSION_C " (2in1)"

-#else

-	#define YAMN_VER	"YAMN " YAMN_VERSION_C " (WinNT)"

-#endif

+

+#ifdef _DEBUG

 

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

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

diff --git a/plugins/YAMN/src/debug.h b/plugins/YAMN/src/debug.h
index 3bde9ddc81..9581117503 100644
--- a/plugins/YAMN/src/debug.h
+++ b/plugins/YAMN/src/debug.h
@@ -1,23 +1,7 @@
 #ifndef __DEBUG_H

 #define __DEBUG_H

 

-//	#define YAMN_DEBUG

-

-//#define YAMN_VER_BETA

-//#define YAMN_VER_BETA_CRASHONLY

-

-#ifdef YAMN_DEBUG

-

-//#pragma comment(lib, "th32.lib")

-

-#if !defined(_WIN32_WINNT)

-#define _WIN32_WINNT 0x0501 // WinXP only

-#endif

-#define VC_EXTRALEAN

-#include <windows.h>

-#include <tlhelp32.h>

-#include <stdio.h>

-#include <shlwapi.h>

+#ifdef _DEBUG

 

 //#define DEBUG_SYNCHRO			//debug synchro to a file

 //#define DEBUG_COMM			//debug communiation to a file

diff --git a/plugins/YAMN/src/mails/decode.cpp b/plugins/YAMN/src/mails/decode.cpp
index a0d96dbfb0..f87658547e 100644
--- a/plugins/YAMN/src/mails/decode.cpp
+++ b/plugins/YAMN/src/mails/decode.cpp
@@ -151,7 +151,7 @@ struct _tcptable CodePageNamesAll[]=
 	{ "MAC-", "CR",0,10082}

 };

 

-int CPLENALL = (sizeof(CodePageNamesAll)/sizeof(CodePageNamesAll[0]));

+int CPLENALL = SIZEOF(CodePageNamesAll);

 struct _tcptable *CodePageNamesSupp;

 int CPLENSUPP = 1;

 

diff --git a/plugins/YAMN/src/mails/m_decode.h b/plugins/YAMN/src/mails/decode.h
index e6d2b52fae..432efafb0b 100644
--- a/plugins/YAMN/src/mails/m_decode.h
+++ b/plugins/YAMN/src/mails/decode.h
@@ -1,8 +1,6 @@
 #ifndef __DECODE_H

 #define __DECODE_H

 

-#include "../debug.h"

-

 #define DOTLINE(s)	((((s)[-2]=='\r') || ((s)[-2]=='\n')) && ((s)[-1]=='.') && (((s)[0]=='\r') || ((s)[0]=='\n') || ((s)[0]=='\0')))	// be careful, it's different to ESR's pop3.c ;-)

 #define ENDLINE(s)	(((s)[0]=='\r') || ((s)[0]=='\n'))	//endline

 #define WS(s)		(((s)[0]==' ') || ((s)[0]=='\t'))	//whitespace

diff --git a/plugins/YAMN/src/mails/mails.cpp b/plugins/YAMN/src/mails/mails.cpp
index 758a00dbd5..716d1905f0 100644
--- a/plugins/YAMN/src/mails/mails.cpp
+++ b/plugins/YAMN/src/mails/mails.cpp
@@ -4,7 +4,6 @@
  * (c) majvan 2002-2004

  */

 

-#pragma warning( disable : 4290 )

 #include "../yamn.h"

 

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

diff --git a/plugins/YAMN/src/mails/mime.cpp b/plugins/YAMN/src/mails/mime.cpp
index 33b7735b82..4e29884b14 100644
--- a/plugins/YAMN/src/mails/mime.cpp
+++ b/plugins/YAMN/src/mails/mime.cpp
@@ -4,23 +4,8 @@
  * (c) majvan 2002-2004

  */

 

-#pragma warning( disable : 4290 )

 #include "../yamn.h"

 

-//- imported ---------------------------------------------------------------------------------------

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

-

-extern SWMRG *AccountBrowserSO;

-extern struct WndHandles *MessageWnd;

-

-extern int GetCharsetFromString(char *input,size_t size);

-extern void SendMsgToRecepients(struct WndHandles *FirstWin,UINT msg,WPARAM wParam,LPARAM lParam);

-extern void ConvertCodedStringToUnicode(char *stream,WCHAR **storeto,DWORD cp,int mode);

-extern DWORD WINAPI MailBrowser(LPVOID Param);

-extern DWORD WINAPI NoNewMailProc(LPVOID Param);

-extern DWORD WINAPI BadConnection(LPVOID Param);

-

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

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

 

 //Copies one string to another

diff --git a/plugins/YAMN/src/main.cpp b/plugins/YAMN/src/main.cpp
index c5bc34e0ed..f5796e5225 100644
--- a/plugins/YAMN/src/main.cpp
+++ b/plugins/YAMN/src/main.cpp
@@ -8,12 +8,7 @@
  * (c) majvan 2002-2004

  */

 

-

 #include "yamn.h"

-#include "main.h"

-#include <io.h>

-

-#include "m_hotkeys.h"

 

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

 

@@ -39,15 +34,15 @@ int hLangpack;
 

 PLUGININFOEX pluginInfo = {

 	sizeof(PLUGININFOEX),

-	YAMN_SHORTNAME,

-	YAMN_VERSION,

-	"Mail notifier and browser for Miranda NG. Included POP3 protocol.",

-	"y_b tweety (majvan)",

-	"francois.mean@skynet.be",

-	"© (2002-2004 majvan) 2005-2007 tweety y_b Miranda community",

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

+	__PLUGIN_NAME,

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

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

-	// {B047A7E5-027A-4cfc-8B18-EDA8345D2790}

+	// {B047A7E5-027A-4CFC-8B18-EDA8345D2790}

 	{0xb047a7e5, 0x27a, 0x4cfc, {0x8b, 0x18, 0xed, 0xa8, 0x34, 0x5d, 0x27, 0x90}}

 };

 

@@ -156,8 +151,8 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda
 

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

 

-#ifdef YAMN_DEBUG

-static char unknownCP[1500] = {0};

+#ifdef _DEBUG

+static TCHAR unknownCP[1500] = {0};

 #endif

 // The callback function

 BOOL CALLBACK EnumSystemCodePagesProc(LPTSTR cpStr)

@@ -170,21 +165,21 @@ BOOL CALLBACK EnumSystemCodePagesProc(LPTSTR cpStr)
     //Get Code Page name

     CPINFOEX info;

     if (GetCPInfoEx(cp, 0, &info)) {

-		#ifdef YAMN_DEBUG

+		#ifdef _DEBUG

 		BOOLEAN found = FALSE;

 		#endif

 		for (int i = 1;i<CPLENALL;i++) if (CodePageNamesAll[i].CP == cp) {

 			CodePageNamesAll[i].isValid = TRUE;

 			CPLENSUPP++;

-			#ifdef YAMN_DEBUG

+			#ifdef _DEBUG

 			found = TRUE;

 			#endif

 			break;

 		}

-		#ifdef YAMN_DEBUG

+		#ifdef _DEBUG

 		if (!found) {

-			strcat(unknownCP, info.CodePageName);

-			strcat(unknownCP, "\n");

+			_tcscat(unknownCP, info.CodePageName);

+			_tcscat(unknownCP, _T("\n"));

 		}

 		#endif

 	}

@@ -389,7 +384,7 @@ extern "C" int __declspec(dllexport) Load(void)
 	hCurSplitNS = LoadCursor(NULL, IDC_SIZENS);

 	hCurSplitWE = LoadCursor(NULL, IDC_SIZEWE);

 

-#ifdef YAMN_DEBUG

+#ifdef _DEBUG

 	InitDebug();

 #endif

 

@@ -437,7 +432,7 @@ static void UnloadPlugins()
 

 extern "C" int __declspec(dllexport) Unload(void)

 {

-#ifdef YAMN_DEBUG

+#ifdef _DEBUG

 	UnInitDebug();

 #endif

 	DestroyCursor(hCurSplitNS);

diff --git a/plugins/YAMN/src/main.h b/plugins/YAMN/src/main.h
index b81e965988..7f909df2ca 100644
--- a/plugins/YAMN/src/main.h
+++ b/plugins/YAMN/src/main.h
@@ -1,20 +1,6 @@
 #ifndef __MAIN_H

 #define __MAIN_H

 

-#ifdef __GNUC__

-	#define __try

-	#define __except(x) if (0) /* don't execute handler */

-	#define __finally

-	#define _try __try

-	#define _except __except

-	#define _finally __finally 

-#endif

-

-#define YAMN_SHORTNAME "Mail Notifier"

-#define YAMN_FILENAME "yamn"

-
-
-#include "version.h"
 #define YAMN_NEWMAILSNDDESC		LPGEN("YAMN: new mail message")
 #define YAMN_CONNECTFAILSNDDESC	LPGEN("YAMN: connect failed")
 #define	YAMN_CONNECTFAILSOUND	"YAMN/Sound/ConnectFail"
diff --git a/plugins/YAMN/src/proto/netlib.cpp b/plugins/YAMN/src/proto/netlib.cpp
index cfe3b20c48..0ae92f6f33 100644
--- a/plugins/YAMN/src/proto/netlib.cpp
+++ b/plugins/YAMN/src/proto/netlib.cpp
@@ -5,8 +5,6 @@
  */

 

 #include "..\yamn.h"

-#include "m_netlib.h"

-#include "netlib.h"

 

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

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

@@ -14,9 +12,6 @@
 BOOL SSLLoaded=FALSE;

 HANDLE hNetlibUser=NULL;

 

-extern PVOID TLSCtx;

-extern PVOID SSLCtx;

-

 void __stdcall	SSL_DebugLog(const char *fmt, ...)

 {

 	char		str[ 4096 ];

diff --git a/plugins/YAMN/src/proto/netlib.h b/plugins/YAMN/src/proto/netlib.h
index 90ad3613a5..17259cf219 100644
--- a/plugins/YAMN/src/proto/netlib.h
+++ b/plugins/YAMN/src/proto/netlib.h
@@ -1,10 +1,6 @@
 #ifndef __NETLIB_H

 #define __NETLIB_H

 

-#include "netclient.h"

-

-#pragma warning( disable : 4290 )

-

 class CNLClient: public CNetClient

 {

 public:

diff --git a/plugins/YAMN/src/proto/pop3/pop3.cpp b/plugins/YAMN/src/proto/pop3/pop3.cpp
index bae04363cb..d3f14af9a1 100644
--- a/plugins/YAMN/src/proto/pop3/pop3.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3.cpp
@@ -23,12 +23,7 @@
  *
  */
 
-#pragma warning( disable : 4290 )
-
 #include "..\..\yamn.h"
-#include "pop3.h"
-
-extern void __stdcall	SSL_DebugLog( const char *fmt, ... );
 
 //--------------------------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------------------
diff --git a/plugins/YAMN/src/proto/pop3/pop3.h b/plugins/YAMN/src/proto/pop3/pop3.h
index 4d49f80bec..c65dc2ee26 100644
--- a/plugins/YAMN/src/proto/pop3/pop3.h
+++ b/plugins/YAMN/src/proto/pop3/pop3.h
@@ -1,9 +1,6 @@
 #ifndef __POP3_H

 #define __POP3_H

 

-#include "../../debug.h"

-#include "../netlib.h"				//NetLib client

-

 #define DOTLINE(s)	((((s)[-2]=='\r') || ((s)[-2]=='\n')) && ((s)[-1]=='.') && (((s)[0]=='\r') || ((s)[0]=='\n') || ((s)[0]=='\0')))	// be careful, it's different to ESR's pop3.c ;-)

 #define ENDLINE(s)	(((s)[0]=='\r') || ((s)[0]=='\n'))	//endline

 #define OKLINE(s)	(((s)[0]=='+') && (((s)[1]=='o') || ((s)[1]=='O')) && (((s)[2]=='k') || ((s)[2]=='K')))	// +OK

diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
index 7573484e8c..9514293cf3 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
@@ -10,12 +10,7 @@
 */

 

 

-#pragma warning( disable : 4290 )

 #include "../../yamn.h"

-#include "../../main.h"

-#include "pop3.h"

-#include "pop3comm.h"		//all we need for POP3 account (POP3 account= YAMN account + some more POP3 specified members)

-#include <m_netlib.h>		//socket thorugh proxy functions

 

 #define ERRORSTR_MAXLEN	1024	//in wide-chars

 

@@ -128,7 +123,7 @@ HYAMNPROTOPLUGIN POP3Plugin			= NULL;
 YAMN_PROTOREGISTRATION POP3ProtocolRegistration =

 {

 	"POP3 protocol (internal)",

-	YAMN_VERSION_C,

+	__VERSION_STRING,

 	"© 2002-2004 majvan | 2005-2007 tweety, yb",

 	"Mail notifier and browser for Miranda NG. Included POP3 protocol.",

 	"francois.mean@skynet.be",

diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.h b/plugins/YAMN/src/proto/pop3/pop3comm.h
index c7eb01b5a1..8d75d0876d 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.h
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.h
@@ -1,20 +1,6 @@
 #ifndef __POP3COMM_H

 #define __POP3COMM_H

 

-#include <windows.h>

-#include "pop3.h"

-

-#include "m_protoplugin.h"

-//We can use synchro.h because this is internal plugin. If you use external plugin,

-//and you want to use SO for your plugin, you can use YAMN's SO.

-//All you need is to include synchro.h and use YAMN's exported synchronization functions.

-#include "m_synchro.h"

-

-//For mail exported functions defintions

-#include "m_mails.h"

-

-#include "../../debug.h"

-					

 #define	POP3_FILEVERSION	1	//Version of aditional information stored in book file

 

 typedef struct CPOP3Account: public CAccount

diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
index baebcd0bbd..72696430ab 100644
--- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp
@@ -5,9 +5,6 @@
 */

 

 #include "../../yamn.h"

-#include "../../main.h"

-#include "pop3comm.h"

-#include "pop3opt.h"

 

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

 

diff --git a/plugins/YAMN/src/services.cpp b/plugins/YAMN/src/services.cpp
index 36716453b0..759d998285 100644
--- a/plugins/YAMN/src/services.cpp
+++ b/plugins/YAMN/src/services.cpp
@@ -1,8 +1,4 @@
-

 #include "yamn.h"

-#include "main.h"

-

-extern HANDLE hMenuItemMain, hMenuItemCont, hMenuItemContApp;

 

 static INT_PTR Service_GetCaps(WPARAM wParam, LPARAM lParam)

 {

diff --git a/plugins/YAMN/src/stdafx.cpp b/plugins/YAMN/src/stdafx.cpp
new file mode 100644
index 0000000000..90bdc1cb6c
--- /dev/null
+++ b/plugins/YAMN/src/stdafx.cpp
@@ -0,0 +1,18 @@
+/*

+Copyright (C) 2012-13 Miranda NG Project (http://miranda-ng.org)

+

+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 version 2

+of the License.

+

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

+*/

+

+#include "yamn.h"
\ No newline at end of file
diff --git a/plugins/YAMN/src/version.h b/plugins/YAMN/src/version.h
index 8295e3260b..99e3280e32 100644
--- a/plugins/YAMN/src/version.h
+++ b/plugins/YAMN/src/version.h
@@ -1,3 +1,17 @@
-#define	YAMN_VERSION_H		0,1,2,6

-#define	YAMN_VERSION		PLUGIN_MAKE_VERSION(0,1,2,6)

-#define	YAMN_VERSION_C		"0.1.2.6"

+#define __MAJOR_VERSION				0

+#define __MINOR_VERSION				1

+#define __RELEASE_NUM				2

+#define __BUILD_NUM					6

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+#define __TOSTRING(x)			#x

+#define __VERSION_STRING		__TOSTRING(__FILEVERSION_STRING)

+

+

+#define __PLUGIN_NAME				"Mail Notifier"

+#define __FILENAME					"YAMN.dll"

+#define __DESCRIPTION 				"ail notifier and browser for Miranda NG. Included POP3 protocol."

+#define __AUTHOR					"y_b, tweety, majvan"

+#define __AUTHOREMAIL				"francois.mean@skynet.be"

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

+#define __COPYRIGHT					"© 2002-2004 majvan, 2005-2007 tweety, y_b, Miranda community"

diff --git a/plugins/YAMN/src/yamn.cpp b/plugins/YAMN/src/yamn.cpp
index b50660e450..98d8feaab8 100644
--- a/plugins/YAMN/src/yamn.cpp
+++ b/plugins/YAMN/src/yamn.cpp
@@ -6,12 +6,6 @@
 

 #include "yamn.h"

 

-#include "m_yamn.h"

-#include "m_protoplugin.h"

-#include "m_messages.h"

-#include "m_synchro.h"

-#include "main.h"

-

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

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

 

diff --git a/plugins/YAMN/src/yamn.h b/plugins/YAMN/src/yamn.h
index c8cd8d596d..a0b5ab7eee 100644
--- a/plugins/YAMN/src/yamn.h
+++ b/plugins/YAMN/src/yamn.h
@@ -1,53 +1,53 @@
 

 #ifndef __YAMN_H

 #define __YAMN_H

+

 #ifndef _WIN32_IE

 	#define _WIN32_IE 0x0400

 #endif

+

 #ifndef _WIN32_WINNT

 	#define _WIN32_WINNT 0x0501

 #endif

 

-#include <wchar.h>

-#include <tchar.h>

+#define _CRT_SECURE_NO_WARNINGS

+#define VC_EXTRALEAN

+

 #include <windows.h>

-#include <stdio.h>

-#include <direct.h>			//For _chdir()

-

-#define MIRANDA_VER 0x0A00

-

-#include <commctrl.h>		//For hotkeys

-#include "win2k.h"

-#include "newpluginapi.h"	//CallService,UnHookEvent

-#include "m_utils.h"		//window broadcasting

-#include "m_system.h"

-#include "m_skin.h"

-#include "m_langpack.h"

-#include "m_clist.h"

-#include "m_clui.h"

-#include "m_options.h"

-#include "m_database.h"		//database

-#include "m_contacts.h"		//contact

-#include "m_protocols.h"	//protocols

-#include "m_protomod.h"		//protocols module

-#include "m_protosvc.h"

-#include "m_toptoolbar.h"

-#include "m_icolib.h"

-#include "m_kbdnotify.h"

-#include "m_popup.h"

-#include "m_account.h"	//Account structure and all needed structures to cooperate with YAMN

-#include "m_messages.h"	//Messages sent to YAMN windows

-#include "m_mails.h"	//use YAMN's mails

-#include "mails/m_decode.h"	//use decoding macros (needed for header extracting)

-#include "browser/m_browser.h"	//we want to run YAMN mailbrowser, no new mail notification and bad connect window

+#include <commctrl.h>

+

+#include <win2k.h>

+#include <newpluginapi.h>

+#include <m_skin.h>

+#include <m_langpack.h>

+#include <m_clist.h>

+#include <m_options.h>

+#include <m_database.h>

+#include <m_protomod.h>

+#include <m_icolib.h>

+#include <m_popup.h>

+#include <m_messages.h>

+#include <m_netlib.h>

+#include <m_hotkeys.h>

+

+#include <m_toptoolbar.h>

+#include <m_kbdnotify.h>

+#include <m_filterplugin.h>

+#include <m_yamn.h>

+#include <m_protoplugin.h>

+#include <m_folders.h>

+

+#include "main.h"

+#include "mails/decode.h"

+#include "browser/browser.h"

 #include "resource.h"

-#include "m_protoplugin.h"

-#include "m_filterplugin.h"

-#include "m_yamn.h"	//Main YAMN's variables

-#include "m_protoplugin.h"	//Protocol registration and so on

-#include "m_synchro.h"	//Synchronization

 #include "debug.h"

-#include <m_folders.h>

+#include "version.h"

+#include "proto\netclient.h"

+#include "proto\netlib.h"

+#include "proto\pop3\pop3.h"

+#include "proto\pop3\pop3comm.h"

+#include "proto\pop3\pop3opt.h"

 

 

 //From services.cpp

@@ -65,8 +65,7 @@ extern HANDLE ExitEV;
 extern HANDLE WriteToFileEV;

 

 //From debug.cpp

-#undef YAMN_DEBUG

-#ifdef YAMN_DEBUG

+#ifdef _DEBUG

 void InitDebug();

 void UnInitDebug();

 #endif

@@ -181,10 +180,8 @@ int AddTopToolbarIcon(WPARAM,LPARAM);	//Executed when TopToolBar plugin loaded A
 extern TCHAR UserDirectory[];		//e.g. "F:\WINNT\Profiles\UserXYZ"

 extern TCHAR ProfileName[];		//e.g. "majvan"

 extern SWMRG *AccountBrowserSO;

-extern CRITICAL_SECTION PluginRegCS;

 extern YAMN_VARIABLES YAMNVar;

 extern HANDLE hNewMailHook;

-extern HANDLE WriteToFileEV;

 extern HANDLE hTTButton;

 extern HCURSOR hCurSplitNS, hCurSplitWE;

 extern UINT SecTimer;

@@ -222,9 +219,6 @@ WCHAR *ParseMultipartBody(char *src, char *bond);
 

 //From account.cpp

 void WINAPI GetStatusFcn(HACCOUNT Which,TCHAR *Value);

-extern int StopAccounts(HYAMNPROTOPLUGIN Plugin);

-extern int DeleteAccounts(HYAMNPROTOPLUGIN Plugin);

-extern int WaitForAllAccounts(HYAMNPROTOPLUGIN Plugin,BOOL GetAccountBrowserAccess);

 

 extern HYAMNPROTOPLUGIN POP3Plugin;

 

@@ -232,11 +226,6 @@ extern HYAMNPROTOPLUGIN POP3Plugin;
 int DecodeQuotedPrintable(char *Src,char *Dst,int DstLen, BOOL isQ);

 int DecodeBase64(char *Src,char *Dst,int DstLen);

 

-//From maild.cpp

-extern INT_PTR LoadMailDataSvc(WPARAM wParam,LPARAM lParam);

-extern INT_PTR UnloadMailDataSvc(WPARAM wParam,LPARAM);

-extern INT_PTR SaveMailDataSvc(WPARAM wParam,LPARAM lParam);

-

 //From filterplugin.cpp

 extern PYAMN_FILTERPLUGINQUEUE FirstFilterPlugin;

 

@@ -265,7 +254,18 @@ extern void __stdcall	SSL_DebugLog( const char *fmt, ... );
 

 extern int YAMN_STATUS;

 

+extern struct WndHandles *MessageWnd;

+

+extern int GetCharsetFromString(char *input,size_t size);

+extern void SendMsgToRecepients(struct WndHandles *FirstWin,UINT msg,WPARAM wParam,LPARAM lParam);

+extern void ConvertCodedStringToUnicode(char *stream,WCHAR **storeto,DWORD cp,int mode);

+extern DWORD WINAPI MailBrowser(LPVOID Param);

+extern DWORD WINAPI NoNewMailProc(LPVOID Param);

+extern DWORD WINAPI BadConnection(LPVOID Param);

+extern PVOID TLSCtx;

+extern PVOID SSLCtx;

+

+extern HANDLE hMenuItemMain, hMenuItemCont, hMenuItemContApp;

 extern PYAMN_VARIABLES pYAMNVar;

-extern HYAMNPROTOPLUGIN POP3Plugin;

 

 #endif