useless junk removed

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

17 files changed, 66 insertions, 330 deletions

diff --git a/include/m_avatars.h b/include/m_avatars.h
index 9462da99b2..411f6db7c8 100644
--- a/include/m_avatars.h
+++ b/include/m_avatars.h
@@ -67,20 +67,6 @@ unless AF_FETCHALWAYS is set.
 #define AVS_OWNAVATAR 128			// is own avatar entry

 #define AVS_NOTREADY  4096

 

-typedef struct avatarCacheEntryA {

-	DWORD cbSize;                   // set to sizeof(struct)

-	HANDLE hContact;                // contacts handle, 0, if it is a protocol avatar

-	HBITMAP hbmPic;                 // bitmap handle of the picutre itself

-	DWORD dwFlags;                  // see above for flag values

-	LONG bmHeight, bmWidth;         // bitmap dimensions

-	DWORD t_lastAccess;             // last access time (currently unused, but plugins should still

-	                                // use it whenever they access the avatar. may be used in the future

-	                                // to implement cache expiration

-	LPVOID lpDIBSection;			// unused field

-	char szFilename[MAX_PATH];      // filename of the avatar (absolute path)

-} AVATARCACHEENTRYA;

-

-#if MIRANDA_VER >= 0x0A00

 typedef struct avatarCacheEntry {

 	DWORD cbSize;                   // set to sizeof(struct)

 	HANDLE hContact;                // contacts handle, 0, if it is a protocol avatar

@@ -93,10 +79,6 @@ typedef struct avatarCacheEntry {
 	LPVOID lpDIBSection;			// unused field

 	TCHAR szFilename[MAX_PATH];		// filename of the avatar (absolute path)

 } AVATARCACHEENTRY;

-#else

-	#define avatarCacheEntry avatarCacheEntryA

-	#define AVATARCACHEENTRY AVATARCACHEENTRYA

-#endif

 

 struct CacheNode {

 	struct CacheNode *pNextNode;

@@ -179,13 +161,8 @@ typedef struct _avatarDrawRequest {
 // will open a file selection dialog.

 

 #define MS_AV_SETAVATAR "SV_Avatars/SetAvatar"

-

-#if defined(_UNICODE) && MIRANDA_VER >= 0x0A00

 #define MS_AV_SETAVATARW "SV_Avatars/SetAvatarW"

 #define MS_AV_SETAVATART MS_AV_SETAVATARW

-#else

-#define MS_AV_SETAVATART MS_AV_SETAVATAR

-#endif

 

 // set a local picture for the given protocol

 //

@@ -194,13 +171,8 @@ typedef struct _avatarDrawRequest {
 // will open a file selection dialog. If lParam == "" the avatar will be removed

 

 #define MS_AV_SETMYAVATAR "SV_Avatars/SetMyAvatar"

-

-#if defined(_UNICODE) && MIRANDA_VER >= 0x0A00

 #define MS_AV_SETMYAVATARW "SV_Avatars/SetMyAvatarW"

 #define MS_AV_SETMYAVATART MS_AV_SETMYAVATARW

-#else

-#define MS_AV_SETMYAVATART MS_AV_SETMYAVATAR

-#endif

 

 // see if is possible to set the avatar for the expecified protocol

 //

@@ -244,15 +216,6 @@ typedef struct _avatarDrawRequest {
 

 #define ME_AV_AVATARCHANGED "SV_Avatars/AvatarChanged"

 

-typedef struct _contactAvatarChangedNotificationA {

-	int      cbSize;             // sizeof()

-	HANDLE   hContact;           // this might have to be set by the caller too

-	int      format;             // PA_FORMAT_*

-	char     filename[MAX_PATH]; // full path to filename which contains the avatar

-	char     hash[128];          // avatar hash

-} CONTACTAVATARCHANGEDNOTIFICATIONA;

-

-#if MIRANDA_VER >= 0x0A00

 typedef struct _contactAvatarChangedNotification {

 	int      cbSize;             // sizeof()

 	HANDLE   hContact;           // this might have to be set by the caller too

@@ -260,9 +223,6 @@ typedef struct _contactAvatarChangedNotification {
 	TCHAR    filename[MAX_PATH]; // full path to filename which contains the avatar

 	TCHAR    hash[128];          // avatar hash

 } CONTACTAVATARCHANGEDNOTIFICATION;

-#else

-#define CONTACTAVATARCHANGEDNOTIFICATION CONTACTAVATARCHANGEDNOTIFICATIONA

-#endif

 

 // fired when the contacts avatar is changed by the contact

 // wParam = hContact

diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h
index a7b628e0bf..d8484e5c2e 100644
--- a/include/m_hotkeys.h
+++ b/include/m_hotkeys.h
@@ -47,14 +47,10 @@ typedef struct
 	const char *pszService;       /* Service to call when HotKey Pressed */

 	WORD DefHotKey;               /* default hot key for action */

 	LPARAM lParam;                /* lParam to pass to service */

-	#if MIRANDA_VER >= 0x900

-		DWORD dwFlags;

-	#endif

+	DWORD dwFlags;

 } HOTKEYDESC;

 

-#if MIRANDA_VER >= 0x900

 #define HOTKEYDESC_SIZE_V1 (offsetof(HOTKEYDESC, dwFlags))

-#endif

 

 #define HKF_MIRANDA_LOCAL		0x8000

 

diff --git a/include/m_langpack.h b/include/m_langpack.h
index 946d2a28cd..529c672967 100644
--- a/include/m_langpack.h
+++ b/include/m_langpack.h
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef M_LANGPACK_H__

 #define M_LANGPACK_H__

 

-#if MIRANDA_VER >= 0x0A00 && !defined( _STATIC )

+#if !defined( _STATIC )

 	#define MIRANDA_CUSTOM_LP

 #endif

 

diff --git a/include/m_netlib.h b/include/m_netlib.h
index 06b41c2a2a..af9f21e51e 100644
--- a/include/m_netlib.h
+++ b/include/m_netlib.h
@@ -365,9 +365,7 @@ typedef struct {
 	char *szHttpPostUrl;

 	char *szHttpGetUrl;

 	int firstGetSequence,firstPostSequence;

-#if MIRANDA_VER >= 0x0900

 	int combinePackets;

-#endif

 } NETLIBHTTPPROXYINFO;

 #define MS_NETLIB_SETHTTPPROXYINFO   "Netlib/SetHttpProxyInfo"

 

diff --git a/include/m_options.h b/include/m_options.h
index e09719c28c..75c2df4057 100644
--- a/include/m_options.h
+++ b/include/m_options.h
@@ -76,26 +76,18 @@ typedef struct {
 	UINT *expertOnlyControls;

 	int nExpertOnlyControls;    //v0.1.2.1+  these controls will be hidden in simple mode. Array must remain valid for duration of dlg.

 

-	#if MIRANDA_VER >= 0x0600

 	union {

 			char* pszTab;		 //v0.6.0.0+ [TRANSLATED-BY-CORE]

 			TCHAR* ptszTab;		 //v0.6.0.0+

 		};

-	#endif

 

-	#if MIRANDA_VER >= 0x0800

-		LPARAM dwInitParam;	 //v0.8.0.0+  a value to pass to lParam of WM_INITDIALOG message

-	#endif

+	LPARAM dwInitParam;	 //v0.8.0.0+  a value to pass to lParam of WM_INITDIALOG message

 }

 	OPTIONSDIALOGPAGE;

 

 #define OPTIONPAGE_OLD_SIZE  (offsetof(OPTIONSDIALOGPAGE, flags))

-#if MIRANDA_VER >= 0x0600

-	#define OPTIONPAGE_OLD_SIZE2 (offsetof(OPTIONSDIALOGPAGE, pszTab))

-#endif

-#if MIRANDA_VER >= 0x0800

-	#define OPTIONPAGE_OLD_SIZE3 (offsetof(OPTIONSDIALOGPAGE, dwInitParam))

-#endif

+#define OPTIONPAGE_OLD_SIZE2 (offsetof(OPTIONSDIALOGPAGE, pszTab))

+#define OPTIONPAGE_OLD_SIZE3 (offsetof(OPTIONSDIALOGPAGE, dwInitParam))

 

 #define ODPF_SIMPLEONLY     1   // page is only shown when in simple mode

 #define ODPF_EXPERTONLY     2   //         "                  expert mode

diff --git a/include/m_protocols.h b/include/m_protocols.h
index f4a5ebe3f0..887ab4e1e4 100644
--- a/include/m_protocols.h
+++ b/include/m_protocols.h
@@ -28,17 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "statusmodes.h"

 

-//call a specific protocol service. See the PS_ constants in m_protosvc.h

-#if MIRANDA_VER < 0x800

-__inline static INT_PTR CallProtoService(const char *szModule,const char *szService,WPARAM wParam,LPARAM lParam)

-{

-	char str[MAXMODULELABELLENGTH];

-	_snprintf(str, sizeof(str), "%s%s", szModule, szService);

-    str[MAXMODULELABELLENGTH-1] = 0;

-	return CallService(str,wParam,lParam);

-}

-#endif

-

 //send a general request through the protocol chain for a contact

 //wParam=0

 //lParam=(LPARAM)(CCSDATA*)&ccs

@@ -53,18 +42,6 @@ typedef struct {
 

 #define MS_PROTO_CALLCONTACTSERVICE    "Proto/CallContactService"

 

-#if MIRANDA_VER < 0x800

-__inline static INT_PTR CallContactService(HANDLE hContact,const char *szProtoService,WPARAM wParam,LPARAM lParam)

-{

-	CCSDATA ccs;

-	ccs.hContact=hContact;

-	ccs.szProtoService=szProtoService;

-	ccs.wParam=wParam;

-	ccs.lParam=lParam;

-	return CallService(MS_PROTO_CALLCONTACTSERVICE,0,(LPARAM)&ccs);

-}

-#endif

-

 //a general network 'ack'

 //wParam=0

 //lParam=(LPARAM)(ACKDATA*)&ack

@@ -124,11 +101,7 @@ typedef struct {
 //when type==ACKTYPE_FILE && (result==ACKRESULT_DATA || result==ACKRESULT_FILERESUME),

 //lParam points to this

 

-#if MIRANDA_VER >= 0x0900

-	#define FNAMECHAR TCHAR

-#else

-	#define FNAMECHAR char

-#endif

+#define FNAMECHAR TCHAR

 

 #define PFTS_RECEIVING 0

 #define PFTS_SENDING   1

@@ -141,30 +114,6 @@ typedef struct {
 	#define PFTS_TCHAR  0

 #endif

 

-typedef struct tagPROTOFILETRANSFERSTATUS_V1 

-{

-	size_t cbSize;

-	HANDLE hContact;

-	int    sending;

-    char **files;

-	int totalFiles;

-	int currentFileNumber;

-	unsigned long totalBytes;

-	unsigned long totalProgress;

-    char *workingDir;

-    char *currentFile;

-	unsigned long currentFileSize;

-	unsigned long currentFileProgress;

-	unsigned long currentFileTime;  //as seconds since 1970

-} 

-PROTOFILETRANSFERSTATUS_V1;

-

-#if MIRANDA_VER < 0x0900

-

-typedef PROTOFILETRANSFERSTATUS_V1 PROTOFILETRANSFERSTATUS;

-

-#else

-

 typedef struct tagPROTOFILETRANSFERSTATUS 

 {

 	size_t cbSize;

@@ -200,8 +149,6 @@ typedef struct tagPROTOFILETRANSFERSTATUS
 } 

 PROTOFILETRANSFERSTATUS;

 

-#endif

-

 //Enumerate the currently running protocols

 //wParam=(WPARAM)(int*)&numberOfProtocols

 //lParam=(LPARAM)(PROTOCOLDESCRIPTOR***)&ppProtocolDescriptors

@@ -240,11 +187,9 @@ typedef struct {
 	int   type;          // module type, see PROTOTYPE_ constants

 

 	// 0.8.0+ additions

-	#if MIRANDA_VER >= 0x800

-		pfnInitProto fnInit; // initializes an empty account

-		pfnUninitProto fnUninit; // deallocates an account instance

-		pfnDestroyProto fnDestroy; // removes an account

-	#endif

+	pfnInitProto fnInit; // initializes an empty account

+	pfnUninitProto fnUninit; // deallocates an account instance

+	pfnDestroyProto fnDestroy; // removes an account

 }

 	PROTOCOLDESCRIPTOR;

 

@@ -266,12 +211,8 @@ typedef struct {
 #define PROTOTYPE_OTHER       10000   //avoid using this if at all possible

 #define PROTOTYPE_DISPROTO    20000

 

-#if MIRANDA_VER >= 0x800

-	#define MS_PROTO_ENUMPROTOS        "Proto/EnumProtos"

-	#define MS_PROTO_ENUMPROTOCOLS     "Proto/EnumAccounts"

-#else

-	#define MS_PROTO_ENUMPROTOCOLS     "Proto/EnumProtocols"

-#endif

+#define MS_PROTO_ENUMPROTOS        "Proto/EnumProtos"

+#define MS_PROTO_ENUMPROTOCOLS     "Proto/EnumAccounts"

 

 //determines if a protocol module is loaded or not

 //wParam=0

@@ -392,11 +333,7 @@ __inline static PROTOACCOUNT* ProtoGetAccount( const char* accName )
 

 __inline static int IsAccountEnabled( const PROTOACCOUNT* pa )

 {

-#if MIRANDA_VER < 0x0900

-	return pa && (( pa->bIsEnabled && !pa->bDynDisabled ) || pa->bOldProto );

-#else

   return (int)CallService( MS_PROTO_ISACCOUNTENABLED, 0, (LPARAM)pa );

-#endif

 }

 

 //determines if an account is locked or not

diff --git a/include/m_protoint.h b/include/m_protoint.h
index 9133309a4c..b069f2dcf2 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -38,13 +38,8 @@ typedef enum
 }

 	PROTOEVENTTYPE;

 

-#if MIRANDA_VER >= 0x0900

-	#define PROTOCHAR TCHAR

-	#define PROTOFILEEVENT PROTORECVFILET

-#else

-	#define PROTOCHAR char

-	#define PROTOFILEEVENT PROTORECVFILE

-#endif

+#define PROTOCHAR TCHAR

+#define PROTOFILEEVENT PROTORECVFILET

 

 #ifndef __cplusplus

 typedef struct tagPROTO_INTERFACE_VTBL

diff --git a/include/m_skin.h b/include/m_skin.h
index 22c36ff11a..1b6880b210 100644
--- a/include/m_skin.h
+++ b/include/m_skin.h
@@ -140,15 +140,11 @@ typedef struct {
 		const char *pszSection;        // [TRANSLATED-BY-CORE] section name used to group sounds (NULL is acceptable) (added during 0.3.4+ (2004/10/*))

 		const TCHAR *ptszSection;

 	};

-	#if MIRANDA_VER >= 0x0900

-		DWORD dwFlags;

-	#endif

+	DWORD dwFlags;

 } SKINSOUNDDESCEX;

 

 #define SKINSOUNDDESC_SIZE_V1  (offsetof(SKINSOUNDDESCEX, pszSection))

-#if MIRANDA_VER >= 0x0900

 #define SKINSOUNDDESC_SIZE_V2  (offsetof(SKINSOUNDDESCEX, dwFlags))

-#endif

 

 // Old struct pre 0.3.4

 typedef struct {

@@ -184,7 +180,6 @@ __inline static INT_PTR SkinAddNewSound(const char *name,const char *description
 }

 

 // 0.9.0+

-#if MIRANDA_VER >= 0x0900

 __inline static INT_PTR SkinAddNewSoundExT(const char *name,const TCHAR *section,const TCHAR *description)

 {

 	SKINSOUNDDESCEX ssd = { 0 };

@@ -206,7 +201,6 @@ __inline static INT_PTR SkinAddNewSoundT(const char *name,const TCHAR *descripti
 	ssd.ptszDefaultFile=defaultFile;

 	return CallService(MS_SKIN_ADDNEWSOUND, 0, (LPARAM)&ssd);

 }

-#endif

 

 //play a named sound event

 //wParam=0

diff --git a/include/m_system.h b/include/m_system.h
index e19ab3b3ed..63a2002743 100644
--- a/include/m_system.h
+++ b/include/m_system.h
@@ -146,22 +146,18 @@ struct MM_INTERFACE
 	void* (*mmi_realloc) (void*, size_t);

 	void  (*mmi_free) (void*);

 

-	#if MIRANDA_VER >= 0x0600

-		void*    (*mmi_calloc) (size_t);

-		char*    (*mmi_strdup) (const char *src);

-		wchar_t* (*mmi_wstrdup) (const wchar_t *src);

-	#endif

-	#if MIRANDA_VER >= 0x0700

-      int      (*mir_snprintf) (char *buffer, size_t count, const char* fmt, ...);

-		int      (*mir_sntprintf) (TCHAR *buffer, size_t count, const TCHAR* fmt, ...);

-		int      (*mir_vsnprintf) (char *buffer, size_t count, const char* fmt, va_list va);

-		int      (*mir_vsntprintf) (TCHAR *buffer, size_t count, const TCHAR* fmt, va_list va);

-

-		wchar_t* (*mir_a2u_cp) (const char* src, int codepage);

-		wchar_t* (*mir_a2u)(const char* src);

-		char*    (*mir_u2a_cp)(const wchar_t* src, int codepage);

-		char*    (*mir_u2a)( const wchar_t* src);

-	#endif

+	void*    (*mmi_calloc) (size_t);

+	char*    (*mmi_strdup) (const char *src);

+	wchar_t* (*mmi_wstrdup) (const wchar_t *src);

+	int      (*mir_snprintf) (char *buffer, size_t count, const char* fmt, ...);

+	int      (*mir_sntprintf) (TCHAR *buffer, size_t count, const TCHAR* fmt, ...);

+	int      (*mir_vsnprintf) (char *buffer, size_t count, const char* fmt, va_list va);

+	int      (*mir_vsntprintf) (TCHAR *buffer, size_t count, const TCHAR* fmt, va_list va);

+

+	wchar_t* (*mir_a2u_cp) (const char* src, int codepage);

+	wchar_t* (*mir_a2u)(const char* src);

+	char*    (*mir_u2a_cp)(const wchar_t* src, int codepage);

+	char*    (*mir_u2a)( const wchar_t* src);

 };

 

 #define MS_SYSTEM_GET_MMI  "Miranda/System/GetMMI"

@@ -178,30 +174,18 @@ __forceinline INT_PTR mir_getMMI( struct MM_INTERFACE* dest )
 	#define mir_free(ptr) mmi.mmi_free(ptr)

 	#define mir_realloc(ptr,size) mmi.mmi_realloc(ptr,size)

 

-	#if MIRANDA_VER >= 0x0600

-		#define mir_calloc(n) mmi.mmi_calloc(n)

-		#define mir_strdup(str) mmi.mmi_strdup(str)

-		#define mir_wstrdup(str) mmi.mmi_wstrdup(str)

-	#else

-		__forceinline char* mir_strdup(const char *src)

-		{	return (src == NULL) ? NULL : strcpy(( char* )mir_alloc( strlen(src)+1 ), src );

-		}

-

-		__forceinline WCHAR* mir_wstrdup(const WCHAR *src)

-		{	return (src == NULL) ? NULL : wcscpy(( WCHAR* )mir_alloc(( wcslen(src)+1 )*sizeof( WCHAR )), src );

-		}

-	#endif

-	#if MIRANDA_VER >= 0x0700

-		#define mir_snprintf   mmi.mir_snprintf

-		#define mir_sntprintf  mmi.mir_sntprintf 

-		#define mir_vsnprintf  mmi.mir_vsnprintf

-		#define mir_vsntprintf mmi.mir_vsntprintf

-

-		#define mir_a2u_cp(src,cp) mmi.mir_a2u_cp(src,cp) 

-		#define mir_a2u(src)       mmi.mir_a2u(src)

-		#define mir_u2a_cp(src,cp) mmi.mir_u2a_cp(src,cp)

-		#define mir_u2a(src)       mmi.mir_u2a(src)

-	#endif

+	#define mir_calloc(n) mmi.mmi_calloc(n)

+	#define mir_strdup(str) mmi.mmi_strdup(str)

+	#define mir_wstrdup(str) mmi.mmi_wstrdup(str)

+	#define mir_snprintf   mmi.mir_snprintf

+	#define mir_sntprintf  mmi.mir_sntprintf 

+	#define mir_vsnprintf  mmi.mir_vsnprintf

+	#define mir_vsntprintf mmi.mir_vsntprintf

+

+	#define mir_a2u_cp(src,cp) mmi.mir_a2u_cp(src,cp) 

+	#define mir_a2u(src)       mmi.mir_a2u(src)

+	#define mir_u2a_cp(src,cp) mmi.mir_u2a_cp(src,cp)

+	#define mir_u2a(src)       mmi.mir_u2a(src)

 #else

 	char* mir_strdup(const char *src);

 	WCHAR* mir_wstrdup(const WCHAR *src);

@@ -260,15 +244,11 @@ struct LIST_INTERFACE
 	int   ( *List_Remove )( SortedList*, int );

 	int   ( *List_IndexOf )( SortedList*, void* );

 

-	#if MIRANDA_VER >= 0x0600

 	int   ( *List_InsertPtr)( SortedList* list, void* p );

 	int   ( *List_RemovePtr)( SortedList* list, void* p );

-	#endif

 

-	#if MIRANDA_VER >= 0x0800

 	void  ( *List_Copy )( SortedList* src, SortedList* dst, size_t );

 	void  ( *List_ObjCopy )( SortedList* src, SortedList* dst, size_t );

-	#endif

 };

 

 #define MS_SYSTEM_GET_LI  "Miranda/System/GetLI"

@@ -314,9 +294,7 @@ struct UTF8_INTERFACE
 	wchar_t* ( *utf8_decodeW )( const char* str );

 

 	// returns the predicted length of the utf-8 string 

-	#if MIRANDA_VER >= 0x0900

-		int ( *utf8_lenW )( const wchar_t* src );

-	#endif

+	int ( *utf8_lenW )( const wchar_t* src );

 };

 

 #define MS_SYSTEM_GET_UTFI  "Miranda/System/GetUTFI"

diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h
index 8c19d7c6f8..99d244097c 100644
--- a/include/m_system_cpp.h
+++ b/include/m_system_cpp.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "m_system.h"

 

-#if defined( __cplusplus ) && MIRANDA_VER >= 0x0600

+#if defined( __cplusplus )

 extern LIST_INTERFACE li;

 

 #define	NumericKeySortT -1

diff --git a/include/m_utils.h b/include/m_utils.h
index 75185bb1ee..bac74a2685 100644
--- a/include/m_utils.h
+++ b/include/m_utils.h
@@ -501,49 +501,6 @@ extern struct SHA1_INTERFACE sha1i;
 #define mir_sha1_finish(A,B)	 sha1i.sha1_finish(A,B)

 #define mir_sha1_hash(A,B,C)	 sha1i.sha1_hash(A,B,C)

 

-// Added in 0.4.0.1

-// Here are some string wrappers that are more safe than the win32 versions

-

-#if MIRANDA_VER < 0x0700

-static __inline int mir_snprintf(char *buffer, size_t count, const char* fmt, ...) {

-	va_list va;

-	int len;

-

-	va_start(va, fmt);

-	len = _vsnprintf(buffer, count-1, fmt, va);

-	va_end(va);

-	buffer[count-1] = 0;

-	return len;

-}

-

-static __inline int mir_sntprintf(TCHAR *buffer, size_t count, const TCHAR* fmt, ...) {

-	va_list va;

-	int len;

-

-	va_start(va, fmt);

-	len = _vsntprintf(buffer, count-1, fmt, va);

-	va_end(va);

-	buffer[count-1] = 0;

-	return len;

-}

-

-static __inline int mir_vsnprintf(char *buffer, size_t count, const char* fmt, va_list va) {

-	int len;

-

-	len = _vsnprintf(buffer, count-1, fmt, va);

-	buffer[count-1] = 0;

-	return len;

-}

-

-static __inline int mir_vsntprintf(TCHAR *buffer, size_t count, const TCHAR* fmt, va_list va) {

-	int len;

-

-	len = _vsntprintf(buffer, count-1, fmt, va);

-	buffer[count-1] = 0;

-	return len;

-}

-#endif

-

 // allows to include TCHAR* strings into mir_snprintf and NetLib_Logf calls

 #if defined( _UNICODE )

 	#define TCHAR_STR_PARAM "%S"

@@ -551,42 +508,6 @@ static __inline int mir_vsntprintf(TCHAR *buffer, size_t count, const TCHAR* fmt
 	#define TCHAR_STR_PARAM "%s"

 #endif

 

-#if MIRANDA_VER < 0x0700

-static __inline wchar_t* mir_a2u_cp( const char* src, int codepage )

-{

-	int cbLen = MultiByteToWideChar( codepage, 0, src, -1, NULL, 0 );

-	wchar_t* result = ( wchar_t* )mir_alloc( sizeof( wchar_t )*(cbLen+1));

-	if ( result == NULL )

-		return NULL;

-

-	MultiByteToWideChar( codepage, 0, src, -1, result, cbLen );

-	result[ cbLen ] = 0;

-	return result;

-}

-

-static __inline wchar_t* mir_a2u( const char* src )

-{

-	return mir_a2u_cp( src, CallService("LangPack/GetCodePage", 0, 0 ));

-}

-

-static __inline char* mir_u2a_cp( const wchar_t* src, int codepage )

-{

-	int cbLen = WideCharToMultiByte( codepage, 0, src, -1, NULL, 0, NULL, NULL );

-	char* result = ( char* )mir_alloc( cbLen+1 );

-	if ( result == NULL )

-		return NULL;

-

-	WideCharToMultiByte( codepage, 0, src, -1, result, cbLen, NULL, NULL );

-	result[ cbLen ] = 0;

-	return result;

-}

-

-static __inline char* mir_u2a( const wchar_t* src )

-{

-	return mir_u2a_cp( src, CallService("LangPack/GetCodePage", 0, 0 ));

-}

-#endif

-

 #ifdef _UNICODE

 	#define mir_t2a(s) mir_u2a(s)

 	#define mir_a2t(s) mir_a2u(s)

diff --git a/include/m_version.h b/include/m_version.h
index c7efee17c8..fb9fda2e4b 100644
--- a/include/m_version.h
+++ b/include/m_version.h
@@ -27,10 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MIRANDA_MAKE_VERSION(a,b,c,d)   (((((DWORD)(a))&0xFF)<<24)|((((DWORD)(b))&0xFF)<<16)|((((DWORD)(c))&0xFF)<<8)|(((DWORD)(d))&0xFF))

 #endif

 

-#define MIRANDA_VERSION_FILEVERSION 0,92,1,63                                

-#define MIRANDA_VERSION_STRING      "0.92.1.63"                              

-#define MIRANDA_VERSION_DISPLAY     "0.92.1 alpha build #63"                 

-#define MIRANDA_VERSION_DWORD       MIRANDA_MAKE_VERSION(0, 92, 1, 63)       

+#define MIRANDA_VERSION_FILEVERSION 0,92,1,64                                

+#define MIRANDA_VERSION_STRING      "0.92.1.64"                              

+#define MIRANDA_VERSION_DISPLAY     "0.92.1 alpha build #64"                 

+#define MIRANDA_VERSION_DWORD       MIRANDA_MAKE_VERSION(0, 92, 1, 64)       

 #define MIRANDA_VERSION_CORE        MIRANDA_MAKE_VERSION(0, 92, 1, 0)        

 #define MIRANDA_VERSION_CORE_STRING "0.92.1.0"                               

                                                                               

diff --git a/include/m_xml.h b/include/m_xml.h
index c65a8caa93..7ce8f6efa2 100644
--- a/include/m_xml.h
+++ b/include/m_xml.h
@@ -74,7 +74,6 @@ typedef struct
 

 	void    ( *freeMem )( void* );

 

-#if MIRANDA_VER >= 0x0900

 	// methods added in XML API v2

 	char    ( *isDeclaration )( HXML );

 	LPTSTR  ( *toStringWithFormatting )( HXML node, int* datalen );

@@ -111,7 +110,6 @@ typedef struct
 	XML_ELEMENT_POS ( *positionOfChildByName )( HXML, LPCTSTR name, int i );

 	XML_ELEMENT_POS ( *positionOfText )( HXML, int i );

 	XML_ELEMENT_POS ( *positionOfClear )( HXML, int i );

-#endif

 }

 	XML_API;

 

diff --git a/include/newpluginapi.h b/include/newpluginapi.h
index 0a51132119..d1dcfd8eeb 100644
--- a/include/newpluginapi.h
+++ b/include/newpluginapi.h
@@ -172,17 +172,15 @@ typedef struct tagPLUGINLINK {
 	int (*SetHookDefaultForHookableEvent) (HANDLE, MIRANDAHOOK); // v0.3.4 (2004/09/15)

 	HANDLE (*CreateServiceFunctionParam)(const char *,MIRANDASERVICEPARAM,LPARAM); // v0.7+ (2007/04/24)

 	int (*NotifyEventHooksDirect)(HANDLE,WPARAM,LPARAM); // v0.7+

-	#if MIRANDA_VER >= 0x800

-		INT_PTR (*CallProtoService)(const char *, const char *, WPARAM, LPARAM );

-		INT_PTR (*CallContactService)( HANDLE, const char *, WPARAM, LPARAM );

-		HANDLE (*HookEventParam)(const char *,MIRANDAHOOKPARAM,LPARAM);

-		HANDLE (*HookEventObj)(const char *,MIRANDAHOOKOBJ, void* );

-		HANDLE (*HookEventObjParam)(const char *, MIRANDAHOOKOBJPARAM, void*, LPARAM);

-		HANDLE (*CreateServiceFunctionObj)(const char *,MIRANDASERVICEOBJ,void*);

-		HANDLE (*CreateServiceFunctionObjParam)(const char *,MIRANDASERVICEOBJPARAM,void*,LPARAM);

-		void (*KillObjectServices)(void *);

-		void (*KillObjectEventHooks)(void *);

-	#endif

+	INT_PTR (*CallProtoService)(const char *, const char *, WPARAM, LPARAM );

+	INT_PTR (*CallContactService)( HANDLE, const char *, WPARAM, LPARAM );

+	HANDLE (*HookEventParam)(const char *,MIRANDAHOOKPARAM,LPARAM);

+	HANDLE (*HookEventObj)(const char *,MIRANDAHOOKOBJ, void* );

+	HANDLE (*HookEventObjParam)(const char *, MIRANDAHOOKOBJPARAM, void*, LPARAM);

+	HANDLE (*CreateServiceFunctionObj)(const char *,MIRANDASERVICEOBJ,void*);

+	HANDLE (*CreateServiceFunctionObjParam)(const char *,MIRANDASERVICEOBJPARAM,void*,LPARAM);

+	void (*KillObjectServices)(void *);

+	void (*KillObjectEventHooks)(void *);

 } PLUGINLINK;

 

 #ifndef MODULES_H_

@@ -205,17 +203,15 @@ typedef struct tagPLUGINLINK {
 		#define SetHookDefaultForHookableEvent(a,b)       pluginLink->SetHookDefaultForHookableEvent(a,b)

 		#define CreateServiceFunctionParam(a,b,c)         pluginLink->CreateServiceFunctionParam(a,b,c)

 		#define NotifyEventHooksDirect(a,b,c)             pluginLink->NotifyEventHooksDirect(a,b,c)

-		#if MIRANDA_VER >= 0x800

-			#define CallProtoService(a,b,c,d)              pluginLink->CallProtoService(a,b,c,d)

-			#define CallContactService(a,b,c,d)            pluginLink->CallContactService(a,b,c,d)

-			#define HookEventParam(a,b,c)                  pluginLink->HookEventParam(a,b,c)

-			#define HookEventObj(a,b,c)                    pluginLink->HookEventObj(a,b,c)

-			#define HookEventObjParam(a,b,c,d)             pluginLink->HookEventObjParam(a,b,c,d)

-			#define CreateServiceFunctionObj(a,b,c)        pluginLink->CreateServiceFunctionObj(a,b,c)

-			#define CreateServiceFunctionObjParam(a,b,c,d) pluginLink->CreateServiceFunctionObjParam(a,b,c,d)

-			#define KillObjectServices(a)                  pluginLink->KillObjectServices(a)

-			#define KillObjectEventHooks(a)                pluginLink->KillObjectEventHooks(a)

-		#endif

+		#define CallProtoService(a,b,c,d)              pluginLink->CallProtoService(a,b,c,d)

+		#define CallContactService(a,b,c,d)            pluginLink->CallContactService(a,b,c,d)

+		#define HookEventParam(a,b,c)                  pluginLink->HookEventParam(a,b,c)

+		#define HookEventObj(a,b,c)                    pluginLink->HookEventObj(a,b,c)

+		#define HookEventObjParam(a,b,c,d)             pluginLink->HookEventObjParam(a,b,c,d)

+		#define CreateServiceFunctionObj(a,b,c)        pluginLink->CreateServiceFunctionObj(a,b,c)

+		#define CreateServiceFunctionObjParam(a,b,c,d) pluginLink->CreateServiceFunctionObjParam(a,b,c,d)

+		#define KillObjectServices(a)                  pluginLink->KillObjectServices(a)

+		#define KillObjectEventHooks(a)                pluginLink->KillObjectEventHooks(a)

 	#endif

 #endif

 

diff --git a/protocols/MSN/msn.cpp b/protocols/MSN/msn.cpp
index 3748d38adf..ff5a44b627 100644
--- a/protocols/MSN/msn.cpp
+++ b/protocols/MSN/msn.cpp
@@ -97,7 +97,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,LPVOID lpvRes
 

 static int OnModulesLoaded(WPARAM wParam, LPARAM lParam)

 {

-	avsPresent = ServiceExists(MS_AV_SETMYAVATAR) != 0;

+	avsPresent = ServiceExists(MS_AV_SETMYAVATART) != 0;

 	msnHaveChatDll = ServiceExists(MS_GC_REGISTER) != 0;

 

 	MsnLinks_Init();

diff --git a/src/modules/srfile/file.cpp b/src/modules/srfile/file.cpp
index 85eb99a7bc..37f7d15a1f 100644
--- a/src/modules/srfile/file.cpp
+++ b/src/modules/srfile/file.cpp
@@ -208,26 +208,6 @@ void CopyProtoFileTransferStatus(PROTOFILETRANSFERSTATUS *dest, PROTOFILETRANSFE
 

 void UpdateProtoFileTransferStatus(PROTOFILETRANSFERSTATUS *dest, PROTOFILETRANSFERSTATUS *src)

 {

-	if (src->cbSize == sizeof(PROTOFILETRANSFERSTATUS_V1))

-	{

-		PROTOFILETRANSFERSTATUS_V1 *src1 = (PROTOFILETRANSFERSTATUS_V1*)src;

-		src = (PROTOFILETRANSFERSTATUS*)alloca(sizeof(PROTOFILETRANSFERSTATUS));

-

-		src->cbSize               = sizeof(PROTOFILETRANSFERSTATUS);

-		src->hContact             = src1->hContact;

-		src->flags                = src1->sending ? PFTS_SENDING : 0;

-		src->pszFiles             = src1->files;

-		src->totalFiles           = src1->totalFiles;

-		src->currentFileNumber    = src1->currentFileNumber;

-		src->totalBytes           = src1->totalBytes;

-		src->totalProgress        = src1->totalProgress;

-		src->szWorkingDir         = src1->workingDir;

-		src->szCurrentFile        = src1->currentFile;

-		src->currentFileSize      = src1->currentFileSize;

-		src->currentFileProgress  = src1->currentFileProgress;

-		src->currentFileTime      = src1->currentFileTime;

-	}

-

 	dest->hContact = src->hContact;

 	dest->flags = src->flags;

 	if ( dest->totalFiles != src->totalFiles ) {

diff --git a/src/modules/srfile/filexferdlg.cpp b/src/modules/srfile/filexferdlg.cpp
index 0a6246dea0..4a6f40436b 100644
--- a/src/modules/srfile/filexferdlg.cpp
+++ b/src/modules/srfile/filexferdlg.cpp
@@ -598,24 +598,15 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 					TCHAR str[64], str2[64], szSizeDone[32], szSizeTotal[32];//,*contactName;

 					int units;

 

-					if ( dat->fileVirusScanned==NULL )

+					if ( dat->fileVirusScanned == NULL )

 						dat->fileVirusScanned=(int*)mir_calloc(sizeof(int) * fts->totalFiles);

 

 					// This needs to be here - otherwise we get holes in the files array

-					if (!dat->send) 

-					{

+					if (!dat->send) {

 						if (dat->files == NULL)

 							dat->files = (TCHAR**)mir_calloc((fts->totalFiles + 1) * sizeof(TCHAR*));

 						if (fts->currentFileNumber < fts->totalFiles && dat->files[fts->currentFileNumber] == NULL) 

-						{

-							if (fts->cbSize == sizeof(PROTOFILETRANSFERSTATUS_V1))

-							{

-								PROTOFILETRANSFERSTATUS_V1 *fts1 = (PROTOFILETRANSFERSTATUS_V1*)fts;

-								dat->files[fts->currentFileNumber] = PFTS_StringToTchar(0, (PROTOCHAR*)fts1->currentFile);

-							}

-							else

-								dat->files[fts->currentFileNumber] = PFTS_StringToTchar(fts->flags, fts->tszCurrentFile);

-						}

+							dat->files[fts->currentFileNumber] = PFTS_StringToTchar(fts->flags, fts->tszCurrentFile);

 					}

 

 					/* HACK: for 0.3.3, limit updates to around 1.1 ack per second */