PS_CHANGEINFO is never called, and therefore exterminated

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

35 files changed, 27 insertions, 201 deletions

diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc
index 335e2073ce..4ec06e3775 100644
--- a/include/delphi/m_protosvc.inc
+++ b/include/delphi/m_protosvc.inc
@@ -514,23 +514,6 @@ const
   PS_ADDTOLISTBYEVENT = '/AddToListByEvent';

 

   {

-    wParam : InfoType

-    lParam : Pointer to InfoData

-    Affect : Changes user details as stored on the server, see notes

-    Returns: A Handle to the change request or NULL(0) on failure

-    Notes  : the details stored on the server are very protocol spec'd

-             so this service just supplies an outline for protocols to use.

-             See protocol-specific documentation for what infoTypes are available

-             and what InfoData should be for each infoTypes.

-             -

-             Sends an ack type=ACKTYPE_SETINFO, result=ACKRESULT_SUCCESS/FAILURE, lParam=0

-             -

-             This description just leaves me cold.

-    Version: v0.1.2.0+

-  }

-  PS_CHANGEINFO = '/ChangeInfo';

-

-  {

     wParam : HFILETRANSFER

     lParam : Pointer to a initalised TPROTOFILERESUME

     Affect : Informs the protocol of the user's chosen resume behaviour, see notes

diff --git a/include/m_protoint.h b/include/m_protoint.h
index 250fda3176..b2953f2af6 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -158,8 +158,6 @@ struct  PROTO_INTERFACE : public MZeroedObject
 	virtual	int      __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*) = 0;

 	virtual	int      __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage) = 0;

 

-	virtual	HANDLE   __cdecl ChangeInfo(int iInfoType, void* pInfoData) = 0;

-

 	virtual	HANDLE   __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath) = 0;

 	virtual	int      __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer) = 0;

 	virtual	int      __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason) = 0;

diff --git a/include/m_protosvc.h b/include/m_protosvc.h
index 3b13692b32..d083caf1ec 100644
--- a/include/m_protosvc.h
+++ b/include/m_protosvc.h
@@ -421,18 +421,6 @@ typedef struct {
 //once, you should just do lots of calls.

 #define PS_ADDTOLISTBYEVENT  "/AddToListByEvent"

 

-//Changes our user details as stored on the server   v0.1.2.0+

-//wParam = infoType

-//lParam = (LPARAM)(void*)pInfoData

-//Returns a HANDLE to the change request, or NULL on failure

-//The details information that is stored on the server is very protocol-

-//specific, so this service just supplies an outline for protocols to use.

-//See protocol-specific documentation for what infoTypes are available and

-//what pInfoData should be for each infoType.

-//Sends an ack type = ACKTYPE_SETINFO, result = ACKRESULT_SUCCESS/FAILURE,

-//lParam = 0 on completion.

-#define PS_CHANGEINFO     "/ChangeInfo"

-

 //Informs the protocol of the users chosen resume behaviour   v0.1.2.2+

 //wParam = (WPARAM)(HANDLE)hFileTransfer

 //lParam = (LPARAM)(PROTOFILERESUME*)&pfr

diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp
index fb51b7e3b9..d492744908 100644
--- a/protocols/AimOscar/src/proto.cpp
+++ b/protocols/AimOscar/src/proto.cpp
@@ -186,14 +186,6 @@ int __cdecl CAimProto::AuthRequest(MCONTACT hContact, const TCHAR* szMessage)
 }

 

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

-// ChangeInfo

-

-HANDLE __cdecl CAimProto::ChangeInfo(int iInfoType, void* pInfoData)

-{

-	return NULL;

-}

-

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

 // FileAllow - starts a file transfer

 

 HANDLE __cdecl CAimProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath)

diff --git a/protocols/AimOscar/src/proto.h b/protocols/AimOscar/src/proto.h
index 9a59176ab0..382d600348 100644
--- a/protocols/AimOscar/src/proto.h
+++ b/protocols/AimOscar/src/proto.h
@@ -36,8 +36,6 @@ struct CAimProto : public PROTO<CAimProto>
 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT* );

 	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage );

 

-	virtual	HANDLE    __cdecl ChangeInfo( int iInfoType, void* pInfoData );

-

 	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath );

 	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer );

 	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason );

diff --git a/protocols/FacebookRM/src/proto.h b/protocols/FacebookRM/src/proto.h
index 27c29883ca..cf01d962d5 100644
--- a/protocols/FacebookRM/src/proto.h
+++ b/protocols/FacebookRM/src/proto.h
@@ -70,8 +70,6 @@ public:
 	virtual	int      __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int      __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage);

 

-	virtual	HANDLE   __cdecl ChangeInfo(int iInfoType, void* pInfoData);

-

 	virtual	HANDLE   __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath);

 	virtual	int      __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer);

 	virtual	int      __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason);

diff --git a/protocols/FacebookRM/src/stubs.cpp b/protocols/FacebookRM/src/stubs.cpp
index 8329a78980..47553993e6 100644
--- a/protocols/FacebookRM/src/stubs.cpp
+++ b/protocols/FacebookRM/src/stubs.cpp
@@ -32,12 +32,6 @@ int FacebookProto::AuthRecv(MCONTACT hContact,PROTORECVEVENT *)
 	return 1;

 }

 

-HANDLE FacebookProto::ChangeInfo(int type,void *info_data)

-{

-	MessageBoxA(0,"ChangeInfo","",0);

-	return NULL;

-}

-

 HANDLE FacebookProto::FileAllow(MCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *path)

 {

 	return NULL;

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index e4258d97c8..5b6b7f43c4 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -129,7 +129,6 @@ int      GGPROTO::Authorize(HANDLE hDbEvent) { return 1; }
 int      GGPROTO::AuthDeny(HANDLE hDbEvent, const TCHAR *szReason) { return 1; }

 int      GGPROTO::AuthRecv(MCONTACT hContact, PROTORECVEVENT *pre) { return 1; }

 int      GGPROTO::AuthRequest(MCONTACT hContact, const TCHAR *szMessage) { return 1; }

-HANDLE   GGPROTO::ChangeInfo(int iInfoType, void *pInfoData) { return NULL; }

 int      GGPROTO::FileResume(HANDLE hTransfer, int *action, const PROTOCHAR** szFilename) { return 1; }

 HANDLE   GGPROTO::SearchByEmail(const PROTOCHAR *email) { return NULL; }

 int      GGPROTO::RecvContacts(MCONTACT hContact, PROTORECVEVENT *pre) { return 1; }

diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h
index fc34dd0aab..4629a06824 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.h
+++ b/protocols/Gadu-Gadu/src/gg_proto.h
@@ -39,8 +39,6 @@ struct GGPROTO : public PROTO<GGPROTO>
 	virtual	int      __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT* );

 	virtual	int      __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage );

 

-	virtual	HANDLE   __cdecl ChangeInfo( int iInfoType, void* pInfoData );

-

 	virtual	HANDLE   __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath );

 	virtual	int      __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer );

 	virtual	int      __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason );

diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h
index bb6f6d7a70..6ba49149e2 100644
--- a/protocols/IRCG/src/irc.h
+++ b/protocols/IRCG/src/irc.h
@@ -222,8 +222,6 @@ struct CIrcProto : public PROTO<CIrcProto>
 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR *szMessage);

 

-	virtual	HANDLE    __cdecl ChangeInfo( int iInfoType, void *pInfoData);

-

 	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *szPath);

 	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer );

 	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR *szReason);

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index de66eb369b..5a5f910aea 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -397,14 +397,6 @@ int __cdecl CIrcProto::AuthRequest(MCONTACT, const TCHAR*)
 }

 

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

-// ChangeInfo

-

-HANDLE __cdecl CIrcProto::ChangeInfo(int, void*)

-{

-	return NULL;

-}

-

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

 // FileAllow - starts a file transfer

 

 HANDLE __cdecl CIrcProto::FileAllow(MCONTACT, HANDLE hTransfer, const TCHAR* szPath)

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index e5072dd48f..a42f46a33e 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -504,15 +504,6 @@ int __cdecl CIcqProto::AuthRequest(MCONTACT hContact, const TCHAR* szMessage)
 

 

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

-// ChangeInfo

-

-HANDLE __cdecl CIcqProto::ChangeInfo(int iInfoType, void* pInfoData)

-{

-	return NULL;

-}

-

-

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

 // PS_FileAllow - starts a file transfer

 

 HANDLE __cdecl CIcqProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath)

diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index 5b412c3390..cc4b6a8e4b 100644
--- a/protocols/IcqOscarJ/src/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
@@ -62,8 +62,6 @@ struct CIcqProto : public PROTO<CIcqProto>
 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR *szMessage);

 

-	virtual	HANDLE    __cdecl ChangeInfo( int iInfoType, void *pInfoData);

-

 	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *szPath);

 	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer);

 	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR *szReason);

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 4c88c7ca4b..d333351ebd 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -506,14 +506,6 @@ int __cdecl CJabberProto::AuthRequest(MCONTACT, const TCHAR*)
 }

 

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

-// ChangeInfo

-

-HANDLE __cdecl CJabberProto::ChangeInfo(int /*iInfoType*/, void*)

-{

-	return NULL;

-}

-

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

 // JabberFileAllow - starts a file transfer

 

 HANDLE __cdecl CJabberProto::FileAllow(MCONTACT /*hContact*/, HANDLE hTransfer, const TCHAR *szPath)

diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index 84533eb9da..2c384c2c9c 100644
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -90,8 +90,6 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR *szMessage);

 

-	virtual	HANDLE    __cdecl ChangeInfo(int iInfoType, void* pInfoData);

-

 	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *szPath);

 	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer);

 	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR *szReason);

diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index 0bb77b16bd..13e7f9f666 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -184,7 +184,6 @@ MCONTACT CMraProto::AddToListByEvent(int flags, int iContact, HANDLE hDbEvent)
 /////////////////////////////////////////////////////////////////////////////////////////

 // Stubs

 

-HANDLE CMraProto::ChangeInfo(int, void*) { return NULL; }

 int    CMraProto::FileResume(HANDLE, int*, const TCHAR**) { return 1; }

 int    CMraProto::RecvAwayMsg(MCONTACT, int, PROTORECVEVENT*) { return 1; }

 int    CMraProto::RecvUrl(MCONTACT, PROTORECVEVENT*) { return 1; }

diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h
index 9377aafc9b..c5d642b46c 100644
--- a/protocols/MRA/src/MraProto.h
+++ b/protocols/MRA/src/MraProto.h
@@ -46,8 +46,6 @@ struct CMraProto : public PROTO<CMraProto>
 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage);

 

-	virtual	HANDLE    __cdecl ChangeInfo(int iInfoType, void* pInfoData);

-

 	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath);

 	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer);

 	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason);

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index 292bfaf8c0..b46434f68e 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -314,14 +314,6 @@ int __cdecl CMsnProto::AuthRequest(MCONTACT hContact, const TCHAR* szMessage)
 	return 1;

 }

 

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

-// ChangeInfo

-

-HANDLE __cdecl CMsnProto::ChangeInfo(int iInfoType, void* pInfoData)

-{

-	return NULL;

-}

-

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

 // MsnAuthAllow - called after successful authorization

 

diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h
index 74d758dcbf..540a889f2e 100644
--- a/protocols/MSN/src/msn_proto.h
+++ b/protocols/MSN/src/msn_proto.h
@@ -40,8 +40,6 @@ struct CMsnProto : public PROTO<CMsnProto>
 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage);

 

-	virtual	HANDLE    __cdecl ChangeInfo(int iInfoType, void* pInfoData);

-

 	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath);

 	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer);

 	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason);

diff --git a/protocols/Omegle/src/proto.h b/protocols/Omegle/src/proto.h
index 7e8ce70cad..09fcbdc548 100644
--- a/protocols/Omegle/src/proto.h
+++ b/protocols/Omegle/src/proto.h
@@ -52,8 +52,6 @@ public:
 	virtual	int      __cdecl AuthRecv( MCONTACT hContact, PROTORECVEVENT* );

 	virtual	int      __cdecl AuthRequest( MCONTACT hContact, const PROTOCHAR* szMessage );

 

-	virtual	HANDLE   __cdecl ChangeInfo( int iInfoType, void* pInfoData );

-

 	virtual	HANDLE   __cdecl FileAllow( MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath );

 	virtual	int      __cdecl FileCancel( MCONTACT hContact, HANDLE hTransfer );

 	virtual	int      __cdecl FileDeny( MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason );

diff --git a/protocols/Omegle/src/stubs.cpp b/protocols/Omegle/src/stubs.cpp
index 897ab43de3..2e0dc3e3e0 100644
--- a/protocols/Omegle/src/stubs.cpp
+++ b/protocols/Omegle/src/stubs.cpp
@@ -52,11 +52,6 @@ int OmegleProto::AuthRequest(MCONTACT hContact,const PROTOCHAR *message)
 	return 1;

 }

 

-HANDLE OmegleProto::ChangeInfo(int type,void *info_data)

-{

-	return NULL;

-}

-

 HANDLE OmegleProto::FileAllow(MCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *path)

 {

 	return NULL;

diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp
index 204f446c29..8931a48498 100644
--- a/protocols/Skype/src/skype_proto.cpp
+++ b/protocols/Skype/src/skype_proto.cpp
@@ -142,8 +142,6 @@ int __cdecl CSkypeProto::AuthRequest(MCONTACT hContact, const TCHAR* szMessage)
 	return 1;

 }

 

-HANDLE __cdecl CSkypeProto::ChangeInfo( int iInfoType, void* pInfoData ) { return 0; }

-

 HANDLE __cdecl CSkypeProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath ) 

 { 

 	uint oid = (uint)hTransfer;

diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h
index 3e009ea67b..5f6bb13e2d 100644
--- a/protocols/Skype/src/skype_proto.h
+++ b/protocols/Skype/src/skype_proto.h
@@ -187,8 +187,6 @@ public:
 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT* );

 	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage );

 

-	virtual	HANDLE    __cdecl ChangeInfo( int iInfoType, void* pInfoData );

-

 	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath );

 	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer );

 	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason );

diff --git a/protocols/Tlen/src/tlen.h b/protocols/Tlen/src/tlen.h
index b914fbc6f3..652e706348 100644
--- a/protocols/Tlen/src/tlen.h
+++ b/protocols/Tlen/src/tlen.h
@@ -226,8 +226,6 @@ struct TlenProtocol : public PROTO<TlenProtocol>
 	virtual	int      __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int      __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage);

 

-	virtual	HANDLE   __cdecl ChangeInfo(int iInfoType, void* pInfoData);

-

 	virtual	HANDLE   __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath);

 	virtual	int      __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer);

 	virtual	int      __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason);

diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp
index ef41abccd4..6221fb5032 100644
--- a/protocols/Tlen/src/tlen_svc.cpp
+++ b/protocols/Tlen/src/tlen_svc.cpp
@@ -1210,12 +1210,6 @@ int TlenProtocol::AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage)
 	return 1;

 }

 

-HANDLE TlenProtocol::ChangeInfo(int iInfoType, void* pInfoData)

-{

-	return NULL;

-}

-

-

 int TlenProtocol::RecvContacts(MCONTACT hContact, PROTORECVEVENT* evt)

 {

 	return 1;

diff --git a/protocols/Twitter/src/proto.h b/protocols/Twitter/src/proto.h
index 7ad5188626..659e2b41d5 100644
--- a/protocols/Twitter/src/proto.h
+++ b/protocols/Twitter/src/proto.h
@@ -44,8 +44,6 @@ public:
 	virtual	int       __cdecl AuthRecv(MCONTACT, PROTORECVEVENT *);

 	virtual	int       __cdecl AuthRequest(MCONTACT, const TCHAR *);

 

-	virtual	HANDLE    __cdecl ChangeInfo(int,void *);

-

 	virtual	HANDLE    __cdecl FileAllow(MCONTACT, HANDLE, const TCHAR *);

 	virtual	int       __cdecl FileCancel(MCONTACT, HANDLE);

 	virtual	int       __cdecl FileDeny(MCONTACT, HANDLE, const TCHAR *);

diff --git a/protocols/Twitter/src/stubs.cpp b/protocols/Twitter/src/stubs.cpp
index a959f6d487..2fc9aebacc 100644
--- a/protocols/Twitter/src/stubs.cpp
+++ b/protocols/Twitter/src/stubs.cpp
@@ -42,12 +42,6 @@ int TwitterProto::AuthRequest(MCONTACT hContact,const TCHAR *message)
 	return 1;

 }

 

-HANDLE TwitterProto::ChangeInfo(int type,void *info_data)

-{

-	MessageBoxA(0,"ChangeInfo","",0);

-	return NULL;

-}

-

 HANDLE TwitterProto::FileAllow(MCONTACT hContact,HANDLE hTransfer,const TCHAR *path)

 {

 	return NULL;

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index f1697284c2..05a95e68b8 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -110,10 +110,10 @@ DWORD_PTR CVkProto::GetCaps(int type, MCONTACT hContact)
 		return PF1_IM | PF1_CHAT | PF1_SERVERCLIST | PF1_AUTHREQ | PF1_BASICSEARCH | PF1_SEARCHBYEMAIL | PF1_SEARCHBYNAME | PF1_MODEMSG;

 

 	case PFLAGNUM_2:

-		return PF2_ONLINE | PF2_INVISIBLE | PF2_ONTHEPHONE | PF2_IDLE; // | PF2_SHORTAWAY;

+		return PF2_ONLINE | PF2_INVISIBLE | PF2_ONTHEPHONE | PF2_IDLE;

 

 	case PFLAGNUM_3:

-		return PF2_ONLINE; // | PF2_SHORTAWAY;

+		return PF2_ONLINE;

 

 	case PFLAGNUM_4:

 		return PF4_NOCUSTOMAUTH | PF4_FORCEADDED | PF4_IMSENDUTF | PF4_AVATARS | PF4_SUPPORTTYPING | PF4_NOAUTHDENYREASON | PF4_IMSENDOFFLINE;

@@ -285,13 +285,11 @@ int CVkProto::AuthRequest(MCONTACT hContact,const PROTOCHAR *message)
 

 int CVkProto::Authorize(HANDLE hDbEvent)

 {

-	//if (!hDbEvent)

 	return 1;

 }

 

 int CVkProto::AuthDeny(HANDLE hDbEvent, const PROTOCHAR *reason)

 {

-	//if (!hDbEvent || isOffline())

 	return 1;

 }

 

@@ -310,12 +308,6 @@ int CVkProto::AuthRecv(MCONTACT hContact,PROTORECVEVENT *)
 	return 1;

 }

 

-HANDLE CVkProto::ChangeInfo(int type,void *info_data)

-{

-	MessageBoxA(0,"ChangeInfo","",0);

-	return NULL;

-}

-

 HANDLE CVkProto::FileAllow(MCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *path)

 {

 	return NULL;

diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h
index 34b34b8f59..8c06d8ee84 100644
--- a/protocols/VKontakte/src/vk_proto.h
+++ b/protocols/VKontakte/src/vk_proto.h
@@ -124,8 +124,6 @@ struct CVkProto : public PROTO<CVkProto>
 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR *szMessage);

 

-	virtual	HANDLE    __cdecl ChangeInfo(int iInfoType, void* pInfoData);

-

 	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR *szPath);

 	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer);

 	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR *szReason);

diff --git a/protocols/WhatsApp/src/proto.h b/protocols/WhatsApp/src/proto.h
index 4e0d36db42..aa8483bd02 100644
--- a/protocols/WhatsApp/src/proto.h
+++ b/protocols/WhatsApp/src/proto.h
@@ -40,8 +40,6 @@ public:
    virtual	int      __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT* )                 { return 1; }

    virtual	int      __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage );

 

-   virtual	HANDLE   __cdecl ChangeInfo( int iInfoType, void* pInfoData ) { return NULL; }

-

    virtual	HANDLE   __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath )     { return NULL; }

    virtual	int      __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer )                             { return 1; }             

    virtual	int      __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason )    { return 1; }

diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 4987c50b34..68b80dbb35 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -289,14 +289,6 @@ int __cdecl CYahooProto::AuthRequest(MCONTACT hContact, const TCHAR* msg )
 }

 

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

-// ChangeInfo

-

-HANDLE __cdecl CYahooProto::ChangeInfo( int /*iInfoType*/, void* )

-{

-	return NULL;

-}

-

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

 // GetCaps - return protocol capabilities bits

 

 DWORD_PTR __cdecl CYahooProto::GetCaps(int type, MCONTACT hContact)

diff --git a/protocols/Yahoo/src/proto.h b/protocols/Yahoo/src/proto.h
index d01daf5144..8b5616e462 100644
--- a/protocols/Yahoo/src/proto.h
+++ b/protocols/Yahoo/src/proto.h
@@ -33,8 +33,6 @@ struct CYahooProto : public PROTO<CYahooProto>
 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT* );

 	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage );

 

-	virtual	HANDLE    __cdecl ChangeInfo( int iInfoType, void* pInfoData );

-

 	virtual	HANDLE    __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath );

 	virtual	int       __cdecl FileCancel(MCONTACT hContact, HANDLE hTransfer );

 	virtual	int       __cdecl FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason );

diff --git a/src/modules/protocols/protoaccs.cpp b/src/modules/protocols/protoaccs.cpp
index 9f7480390b..9b4980b651 100644
--- a/src/modules/protocols/protoaccs.cpp
+++ b/src/modules/protocols/protoaccs.cpp
@@ -302,11 +302,6 @@ static INT_PTR stub4(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
 	return (INT_PTR)ppi->AuthDeny((HANDLE)wParam, StrConvT((const char*)lParam));

 }

 

-static INT_PTR stub7(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)

-{

-	return (INT_PTR)ppi->ChangeInfo(wParam, (void*)lParam);

-}

-

 static INT_PTR stub11(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)

 {

 	PROTOFILERESUME* pfr = (PROTOFILERESUME*)lParam;

@@ -445,7 +440,6 @@ BOOL ActivateAccount(PROTOACCOUNT* pa)
 	CreateProtoServiceEx(pa->szModuleName, PS_ADDTOLISTBYEVENT, (MIRANDASERVICEOBJ)stub2, pa->ppro);

 	CreateProtoServiceEx(pa->szModuleName, PS_AUTHALLOW, (MIRANDASERVICEOBJ)stub3, pa->ppro);

 	CreateProtoServiceEx(pa->szModuleName, PS_AUTHDENY, (MIRANDASERVICEOBJ)stub4, pa->ppro);

-	CreateProtoServiceEx(pa->szModuleName, PS_CHANGEINFO, (MIRANDASERVICEOBJ)stub7, pa->ppro);

 	CreateProtoServiceEx(pa->szModuleName, PS_FILERESUME, (MIRANDASERVICEOBJ)stub11, pa->ppro);

 	CreateProtoServiceEx(pa->szModuleName, PS_GETCAPS, (MIRANDASERVICEOBJ)stub12, pa->ppro);

 	CreateProtoServiceEx(pa->szModuleName, PS_LOADICON, (MIRANDASERVICEOBJ)stub13, pa->ppro);

@@ -461,15 +455,15 @@ BOOL ActivateAccount(PROTOACCOUNT* pa)
 	CreateProtoServiceEx(pa->szModuleName, PS_GETSTATUS, (MIRANDASERVICEOBJ)stub42, pa->ppro);

 

 	if (!ProtoServiceExists(pa->szModuleName, PS_GETAVATARINFO))

-		if ( ProtoServiceExists(pa->szModuleName, PS_GETAVATARINFOW))

+		if (ProtoServiceExists(pa->szModuleName, PS_GETAVATARINFOW))

 			CreateProtoServiceEx(pa->szModuleName, PS_GETAVATARINFO, (MIRANDASERVICEOBJ)stub43, pa->ppro);

 

 	if (!ProtoServiceExists(pa->szModuleName, PS_GETMYAVATAR))

-		if ( ProtoServiceExists(pa->szModuleName, PS_GETMYAVATARW))

+		if (ProtoServiceExists(pa->szModuleName, PS_GETMYAVATARW))

 			CreateProtoServiceEx(pa->szModuleName, PS_GETMYAVATAR, (MIRANDASERVICEOBJ)stub44, pa->ppro);

 

 	if (!ProtoServiceExists(pa->szModuleName, PS_SETMYAVATAR))

-		if ( ProtoServiceExists(pa->szModuleName, PS_SETMYAVATARW))

+		if (ProtoServiceExists(pa->szModuleName, PS_SETMYAVATARW))

 			CreateProtoServiceEx(pa->szModuleName, PS_SETMYAVATAR, (MIRANDASERVICEOBJ)stub45, pa->ppro);

 

 	return TRUE;

@@ -480,19 +474,18 @@ BOOL ActivateAccount(PROTOACCOUNT* pa)
 struct DeactivationThreadParam

 {

 	PROTO_INTERFACE *ppro;

-	pfnUninitProto   fnUninit;

-	bool             bIsDynamic;

-	bool             bErase;

+	pfnUninitProto fnUninit;

+	bool bIsDynamic, bErase;

 };

 

 pfnUninitProto GetProtocolDestructor(char *szProto);

 

 static int DeactivationThread(DeactivationThreadParam* param)

 {

-	PROTO_INTERFACE* p = (PROTO_INTERFACE*)param->ppro;

+	PROTO_INTERFACE *p = (PROTO_INTERFACE*)param->ppro;

 	p->SetStatus(ID_STATUS_OFFLINE);

 

-	char * szModuleName = NEWSTR_ALLOCA(p->m_szModuleName);

+	char *szModuleName = NEWSTR_ALLOCA(p->m_szModuleName);

 

 	if (param->bIsDynamic) {

 		p->OnEvent(EV_PROTO_ONREADYTOEXIT, 0, 0);

@@ -531,7 +524,7 @@ void DeactivateAccount(PROTOACCOUNT* pa, bool bIsDynamic, bool bErase)
 		pa->bAccMgrUIChanged = FALSE;

 	}

 

-	DeactivationThreadParam* param = new DeactivationThreadParam;

+	DeactivationThreadParam *param = new DeactivationThreadParam;

 	param->ppro = pa->ppro;

 	param->fnUninit = GetProtocolDestructor(pa->szProtoName);

 	param->bIsDynamic = bIsDynamic;

diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp
index dfbbd9950f..c0b0410563 100644
--- a/src/modules/protocols/protocols.cpp
+++ b/src/modules/protocols/protocols.cpp
@@ -411,26 +411,21 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 			case 4:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->AuthDeny((HANDLE)wParam,  StrConvT((char*)lParam));

-				else

-					return (INT_PTR)ppi->AuthDeny((HANDLE)wParam, (PROTOCHAR*)lParam);

+				return (INT_PTR)ppi->AuthDeny((HANDLE)wParam, (PROTOCHAR*)lParam);

 			case 5: return (INT_PTR)ppi->AuthRecv(hContact, (PROTORECVEVENT*)lParam);

 			case 6:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->AuthRequest(hContact,  StrConvT((char*)lParam));

-				else

-					return (INT_PTR)ppi->AuthRequest(hContact, (PROTOCHAR*)lParam);

-			case 7: return (INT_PTR)ppi->ChangeInfo(wParam, (void*)lParam);

+				return (INT_PTR)ppi->AuthRequest(hContact, (PROTOCHAR*)lParam);

 			case 8:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->FileAllow(hContact, (HANDLE)wParam,  StrConvT((char*)lParam));

-				else

-					return (INT_PTR)ppi->FileAllow(hContact, (HANDLE)wParam, (PROTOCHAR*)lParam);

+				return (INT_PTR)ppi->FileAllow(hContact, (HANDLE)wParam, (PROTOCHAR*)lParam);

 			case 9: return (INT_PTR)ppi->FileCancel(hContact, (HANDLE)wParam);

 			case 10:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->FileDeny(hContact, (HANDLE)wParam,  StrConvT((char*)lParam));

-				else

-					return (INT_PTR)ppi->FileDeny(hContact, (HANDLE)wParam, (PROTOCHAR*)lParam);

+				return (INT_PTR)ppi->FileDeny(hContact, (HANDLE)wParam, (PROTOCHAR*)lParam);

 			case 11: {

 				PROTOFILERESUME* pfr = (PROTOFILERESUME*)lParam;

 				if (ppi->m_iVersion > 1) {

@@ -448,13 +443,11 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 			case 15:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->SearchBasic(StrConvT((char*)lParam));

-				else

-					return (INT_PTR)ppi->SearchBasic((TCHAR*)lParam);

+				return (INT_PTR)ppi->SearchBasic((TCHAR*)lParam);

 			case 16:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->SearchByEmail(StrConvT((char*)lParam));

-				else

-					return (INT_PTR)ppi->SearchByEmail((TCHAR*)lParam);

+				return (INT_PTR)ppi->SearchByEmail((TCHAR*)lParam);

 			case 17: {

 				PROTOSEARCHBYNAME* psbn = (PROTOSEARCHBYNAME*)lParam;

 				if (ppi->m_iVersion > 1)

@@ -477,7 +470,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 					if (res == 0) FreeFilesMatrix(&files);

 					return res;

 				}

-				else return (INT_PTR)ppi->SendFile(hContact, (TCHAR*)wParam, (TCHAR**)lParam);

+				return (INT_PTR)ppi->SendFile(hContact, (TCHAR*)wParam, (TCHAR**)lParam);

 

 			case 26: return (INT_PTR)ppi->SendMsg(hContact, wParam, (const char*)lParam);

 			case 27: return (INT_PTR)ppi->SendUrl(hContact, wParam, (const char*)lParam);

@@ -488,8 +481,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 			case 33:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->SetAwayMsg(wParam, StrConvT((char*)lParam));

-				else

-					return (INT_PTR)ppi->SetAwayMsg(wParam, (TCHAR*)lParam);

+				return (INT_PTR)ppi->SetAwayMsg(wParam, (TCHAR*)lParam);

 			case 34: return (INT_PTR)ppi->UserIsTyping(wParam, lParam);

 			case 35: lstrcpynA((char*)lParam, ppi->m_szModuleName, wParam); return 0;

 			case 36: return ppi->m_iStatus;

@@ -497,8 +489,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 			case 100:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->SetAwayMsg(wParam, (TCHAR*)lParam);

-				else

-					return (INT_PTR)ppi->SetAwayMsg(wParam, StrConvA((TCHAR*)lParam));

+				return (INT_PTR)ppi->SetAwayMsg(wParam, StrConvA((TCHAR*)lParam));

 			case 102:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->SendFile(hContact, (TCHAR*)wParam, (TCHAR**)lParam);

@@ -511,13 +502,11 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 			case 103:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->FileAllow(hContact, (HANDLE)wParam, (TCHAR*)lParam);

-				else

-					return (INT_PTR)ppi->FileAllow(hContact, (HANDLE)wParam, StrConvA((TCHAR*)lParam));

+				return (INT_PTR)ppi->FileAllow(hContact, (HANDLE)wParam, StrConvA((TCHAR*)lParam));

 			case 104:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->FileDeny(hContact, (HANDLE)wParam, (TCHAR*)lParam);

-				else

-					return (INT_PTR)ppi->FileDeny(hContact, (HANDLE)wParam, StrConvA((TCHAR*)lParam));

+				return (INT_PTR)ppi->FileDeny(hContact, (HANDLE)wParam, StrConvA((TCHAR*)lParam));

 			case 105: {

 				PROTOFILERESUME* pfr = (PROTOFILERESUME*)lParam;

 				if (ppi->m_iVersion > 1)

@@ -533,31 +522,26 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 			case 106:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->AuthRequest(hContact, (const TCHAR*)lParam);

-				else

-					return (INT_PTR)ppi->AuthRequest(hContact, StrConvA((const TCHAR*)lParam));

+				return (INT_PTR)ppi->AuthRequest(hContact, StrConvA((const TCHAR*)lParam));

 			case 107:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->AuthDeny((HANDLE)wParam, (const TCHAR*)lParam);

-				else

-					return (INT_PTR)ppi->AuthDeny((HANDLE)wParam, StrConvA((const TCHAR*)lParam));

+				return (INT_PTR)ppi->AuthDeny((HANDLE)wParam, StrConvA((const TCHAR*)lParam));

 			case 108:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->SearchBasic((const TCHAR*)lParam);

-				else

-					return (INT_PTR)ppi->SearchBasic(StrConvA((const TCHAR*)lParam));

+				return (INT_PTR)ppi->SearchBasic(StrConvA((const TCHAR*)lParam));

 			case 109: {

 				PROTOSEARCHBYNAME* psbn = (PROTOSEARCHBYNAME*)lParam;

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->SearchByName(psbn->pszNick, psbn->pszFirstName, psbn->pszLastName);

-				else

-					return (INT_PTR)ppi->SearchByName(StrConvA((TCHAR*)psbn->pszNick),

-						StrConvA((TCHAR*)psbn->pszFirstName), StrConvA((TCHAR*)psbn->pszLastName));

+				return (INT_PTR)ppi->SearchByName(StrConvA((TCHAR*)psbn->pszNick),

+					StrConvA((TCHAR*)psbn->pszFirstName), StrConvA((TCHAR*)psbn->pszLastName));

 			}

 			case 110:

 				if (ppi->m_iVersion > 1)

 					return (INT_PTR)ppi->SearchByEmail((const TCHAR*)lParam);

-				else

-					return (INT_PTR)ppi->SearchByEmail(StrConvA((const TCHAR*)lParam));

+				return (INT_PTR)ppi->SearchByEmail(StrConvA((const TCHAR*)lParam));

 			}

 		}

 	}

@@ -651,7 +635,6 @@ int LoadProtocolsModule(void)
 	InsertServiceListItem( 4, PS_AUTHDENY);

 	InsertServiceListItem( 5, PSR_AUTH);

 	InsertServiceListItem( 6, PSS_AUTHREQUEST);

-	InsertServiceListItem( 7, PS_CHANGEINFO);

 	InsertServiceListItem( 8, PSS_FILEALLOW);

 	InsertServiceListItem( 9, PSS_FILECANCEL);

 	InsertServiceListItem(10, PSS_FILEDENY);

diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp
index 5ea1f1c371..70fccaa18c 100644
--- a/src/modules/protocols/protoint.cpp
+++ b/src/modules/protocols/protoint.cpp
@@ -82,11 +82,6 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE
 		return res;

 	}

 

-	HANDLE __cdecl ChangeInfo(int iInfoType, void* pInfoData)

-	{

-		return (HANDLE)ProtoCallService(m_szModuleName, PS_CHANGEINFO, iInfoType, (LPARAM)pInfoData);

-	}

-

 	HANDLE __cdecl FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath)

 	{

 		CCSDATA ccs = { hContact, PSS_FILEALLOW, (WPARAM)hTransfer, (LPARAM)szPath };