- PROTO_INTERFACE got the default implementation;

- all unneeded stubs removed from all protocols

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

52 files changed, 353 insertions, 1444 deletions

diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib
index ac1d1d06dd..96b214b0fc 100644
--- a/bin10/lib/mir_core.lib
+++ b/bin10/lib/mir_core.lib
diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib
index e07882ae0b..e588d21af2 100644
--- a/bin10/lib/mir_core64.lib
+++ b/bin10/lib/mir_core64.lib
diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib
index 7a96ae74bf..a7d7bf6404 100644
--- a/bin12/lib/mir_core.lib
+++ b/bin12/lib/mir_core.lib
diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib
index 7b7d29bc3e..31255d77a0 100644
--- a/bin12/lib/mir_core64.lib
+++ b/bin12/lib/mir_core64.lib
diff --git a/include/m_protoint.h b/include/m_protoint.h
index 9c9befbe87..763b9d48ac 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -46,7 +46,7 @@ typedef enum
 #define PROTOCHAR TCHAR

 #define PROTOFILEEVENT PROTORECVFILET

 

-struct  PROTO_INTERFACE : public MZeroedObject

+struct MIR_CORE_EXPORT PROTO_INTERFACE : public MZeroedObject

 {

 	int    m_iStatus,

 	       m_iDesiredStatus,

@@ -151,50 +151,53 @@ struct  PROTO_INTERFACE : public MZeroedObject
 	//////////////////////////////////////////////////////////////////////////////////////

 	// Virtual functions

 

-	virtual	MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr) = 0;

-	virtual	MCONTACT __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent) = 0;

-

-	virtual	int      __cdecl Authorize(MEVENT hDbEvent) = 0;

-	virtual	int      __cdecl AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason) = 0;

-	virtual	int      __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*) = 0;

-	virtual	int      __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage) = 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;

-	virtual	int      __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename) = 0;

-

-	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL) = 0;

-	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType) = 0;

-

-	virtual	HANDLE    __cdecl SearchBasic(const PROTOCHAR* id) = 0;

-	virtual	HANDLE    __cdecl SearchByEmail(const PROTOCHAR* email) = 0;

-	virtual	HANDLE    __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName) = 0;

-	virtual	HWND      __cdecl SearchAdvanced(HWND owner) = 0;

-	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner) = 0;

-

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*) = 0;

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT*) = 0;

-	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*) = 0;

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*) = 0;

-

-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList) = 0;

-	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR *szDescription, PROTOCHAR **ppszFiles) = 0;

-	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char *msg) = 0;

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char *url) = 0;

-

-	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode) = 0;

-	virtual	int       __cdecl SetStatus(int iNewStatus) = 0;

-

-	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact) = 0;

-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt) = 0;

-	virtual	int       __cdecl SetAwayMsg(int iStatus, const PROTOCHAR* msg) = 0;

-

-	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type) = 0;

-

-	virtual	int       __cdecl OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam) = 0;

+	virtual	MCONTACT  __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);

+	virtual	MCONTACT  __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent);

+						    

+	virtual	int       __cdecl Authorize(MEVENT hDbEvent);

+	virtual	int       __cdecl AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason);

+	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

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

+						    

+	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);

+	virtual	int       __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename);

+

+	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);

+	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);

+

+	virtual	HANDLE    __cdecl SearchBasic(const PROTOCHAR* id);

+	virtual	HANDLE    __cdecl SearchByEmail(const PROTOCHAR* email);

+	virtual	HANDLE    __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName);

+	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

+	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

+

+	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT*);

+	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

+	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

+

+	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

+	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR *szDescription, PROTOCHAR **ppszFiles);

+	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char *msg);

+	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char *url);

+

+	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

+	virtual	int       __cdecl SetStatus(int iNewStatus);

+

+	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

+	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt);

+	virtual	int       __cdecl SetAwayMsg(int iStatus, const PROTOCHAR* msg);

+

+	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);

+

+	virtual	int       __cdecl OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam);

 };

 

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

+// Basic class for all protocols written in C++

+

 template<class T> class PROTO : public PROTO_INTERFACE

 {

 

diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp
index db4fab68ce..0b468f1dba 100644
--- a/protocols/AimOscar/src/proto.cpp
+++ b/protocols/AimOscar/src/proto.cpp
@@ -130,11 +130,6 @@ MCONTACT CAimProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
 	return hContact; //See authrequest for serverside addition

 }

 

-MCONTACT __cdecl CAimProto::AddToListByEvent(int flags, int iContact, MEVENT hDbEvent)

-{

-	return NULL;

-}

-

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

 // AuthAllow - processes the successful authorization

 

@@ -152,14 +147,6 @@ int CAimProto::AuthDeny(MEVENT hDbEvent, const TCHAR* szReason)
 }

 

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

-// PSR_AUTH

-

-int __cdecl CAimProto::AuthRecv(MCONTACT hContact, PROTORECVEVENT* evt)

-{

-	return 1;

-}

-

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

 // PSS_AUTHREQUEST

 

 int __cdecl CAimProto::AuthRequest(MCONTACT hContact, const TCHAR* szMessage)

@@ -329,14 +316,6 @@ DWORD_PTR __cdecl CAimProto::GetCaps(int type, MCONTACT hContact)
 }

 

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

-// GetInfo - retrieves a contact info

-

-int __cdecl CAimProto::GetInfo(MCONTACT hContact, int infoType)

-{

-	return 1;

-}

-

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

 // SearchBasic - searches the contact by JID

 

 void __cdecl CAimProto::basic_search_ack_success(void* p)

@@ -387,40 +366,6 @@ HANDLE __cdecl CAimProto::SearchByEmail(const PROTOCHAR* email)
 }

 

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

-// SearchByName - searches the contact by its first or last name, or by a nickname

-

-HANDLE __cdecl CAimProto::SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName)

-{

-	return NULL;

-}

-

-HWND __cdecl CAimProto::SearchAdvanced(HWND owner)

-{

-	return NULL;

-}

-

-HWND __cdecl CAimProto::CreateExtendedSearchUI(HWND owner)

-{

-	return NULL;

-}

-

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

-// RecvContacts

-

-int __cdecl CAimProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

-// RecvFile

-

-int __cdecl CAimProto::RecvFile(MCONTACT hContact, PROTOFILEEVENT* evt)

-{

-	return Proto_RecvFile(hContact, evt);

-}

-

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

 // RecvMsg

 

 int __cdecl CAimProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)

@@ -442,22 +387,6 @@ int __cdecl CAimProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)
 }

 

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

-// RecvUrl

-

-int __cdecl CAimProto::RecvUrl(MCONTACT hContact, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

-// SendContacts

-

-int __cdecl CAimProto::SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList)

-{

-	return 1;

-}

-

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

 // SendFile - sends a file

 

 HANDLE __cdecl CAimProto::SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles)

@@ -610,22 +539,6 @@ int __cdecl CAimProto::SendMsg(MCONTACT hContact, int flags, const char* pszSrc)
 }

 

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

-// SendUrl

-

-int __cdecl CAimProto::SendUrl(MCONTACT hContact, int flags, const char* url)

-{

-	return 1;

-}

-

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

-// SetApparentMode - sets the visibility m_iStatus

-

-int __cdecl CAimProto::SetApparentMode(MCONTACT hContact, int mode)

-{

-	return 0;

-}

-

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

 // SetStatus - sets the protocol m_iStatus

 

 int __cdecl CAimProto::SetStatus(int iNewStatus)

diff --git a/protocols/AimOscar/src/proto.h b/protocols/AimOscar/src/proto.h
index 6635cc7a74..e92f9f34e1 100644
--- a/protocols/AimOscar/src/proto.h
+++ b/protocols/AimOscar/src/proto.h
@@ -29,11 +29,9 @@ struct CAimProto : public PROTO<CAimProto>
 	//====================================================================================

 

 	virtual	MCONTACT  __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );

-	virtual	MCONTACT  __cdecl AddToListByEvent( int flags, int iContact, MEVENT hDbEvent );

 

 	virtual	int       __cdecl Authorize( MEVENT hDbEvent );

 	virtual	int       __cdecl AuthDeny( MEVENT hDbEvent, const TCHAR* szReason );

-	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT* );

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

 

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

@@ -42,25 +40,15 @@ struct CAimProto : public PROTO<CAimProto>
 	virtual	int       __cdecl FileResume( HANDLE hTransfer, int* action, const PROTOCHAR** szFilename );

 

 	virtual	DWORD_PTR __cdecl GetCaps( int type, MCONTACT hContact = NULL );

-	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType );

 

 	virtual	HANDLE    __cdecl SearchBasic( const PROTOCHAR* id );

 	virtual	HANDLE    __cdecl SearchByEmail( const PROTOCHAR* email );

-	virtual	HANDLE    __cdecl SearchByName( const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName );

-	virtual	HWND      __cdecl SearchAdvanced( HWND owner );

-	virtual	HWND      __cdecl CreateExtendedSearchUI( HWND owner );

 

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT* );

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT* );

 	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT* );

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT* );

 

-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

 	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles);

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg );

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url );

 

-	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode );

 	virtual	int       __cdecl SetStatus( int iNewStatus );

 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact );

diff --git a/protocols/Dummy/src/dummy_proto.cpp b/protocols/Dummy/src/dummy_proto.cpp
index 310c450ee1..37d0e4acfe 100644
--- a/protocols/Dummy/src/dummy_proto.cpp
+++ b/protocols/Dummy/src/dummy_proto.cpp
@@ -92,16 +92,6 @@ DWORD_PTR CDummyProto::GetCaps(int type, MCONTACT hContact)
 
 //////////////////////////////////////////////////////////////////////////////
 
-int CDummyProto::OnEvent(PROTOEVENTTYPE event, WPARAM wParam, LPARAM lParam)
-{
-	return 1;
-}
-
-int CDummyProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)
-{
-	return 0;
-}
-
 int CDummyProto::SendMsg(MCONTACT hContact, int flags, const char *msg)
 {
 	ForkThread(&CDummyProto::SendMsgAck, (void*)hContact);
@@ -112,138 +102,3 @@ int CDummyProto::SetStatus(int iNewStatus)
 {
 	return 0;
 }
-
-HANDLE CDummyProto::SearchBasic(const PROTOCHAR* id)
-{
-	return 0;
-}
-
-HANDLE CDummyProto::SearchByEmail(const PROTOCHAR* email)
-{
-	return 0;
-}
-
-HANDLE CDummyProto::SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName)
-{
-	return 0;
-}
-
-MCONTACT CDummyProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
-{
-	return NULL;
-}
-
-int CDummyProto::AuthRequest(MCONTACT hContact,const PROTOCHAR *message)
-{
-	return 0;
-}
-
-int CDummyProto::Authorize(MEVENT hDbEvent)
-{
-	return 1;
-}
-
-int CDummyProto::AuthDeny(MEVENT hDbEvent, const PROTOCHAR *reason)
-{
-	return 1;
-}
-
-int CDummyProto::UserIsTyping(MCONTACT hContact, int type)
-{ 
-	return 1;
-}
-
-MCONTACT CDummyProto::AddToListByEvent(int flags, int iContact, MEVENT hDbEvent)
-{
-	return NULL;
-}
-
-int CDummyProto::AuthRecv(MCONTACT hContact,PROTORECVEVENT *)
-{
-	return 1;
-}
-
-HANDLE CDummyProto::FileAllow(MCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *path)
-{
-	return NULL;
-}
-
-int CDummyProto::FileCancel(MCONTACT hContact,HANDLE hTransfer)
-{
-	return 1;
-}
-
-int CDummyProto::FileDeny(MCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *reason)
-{
-	return 1;
-}
-
-int CDummyProto::FileResume(HANDLE hTransfer,int *action,const PROTOCHAR **filename)
-{
-	return 1;
-}
-
-int CDummyProto::GetInfo(MCONTACT hContact, int infoType)
-{
-	return 1;
-}
-
-HWND CDummyProto::SearchAdvanced(HWND owner)
-{
-	return NULL;
-}
-
-HWND CDummyProto::CreateExtendedSearchUI(HWND owner)
-{
-	return NULL;
-}
-
-int CDummyProto::RecvContacts(MCONTACT hContact,PROTORECVEVENT *)
-{
-	return 1;
-}
-
-int CDummyProto::RecvFile(MCONTACT hContact,PROTORECVFILET *)
-{
-	return 1;
-}
-
-int CDummyProto::RecvUrl(MCONTACT hContact,PROTORECVEVENT *)
-{
-	return 1;
-}
-
-int CDummyProto::SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList)
-{
-	return 1;
-}
-
-HANDLE CDummyProto::SendFile(MCONTACT hContact,const PROTOCHAR *desc, PROTOCHAR **files)
-{
-	return NULL;
-}
-
-int CDummyProto::SendUrl(MCONTACT hContact,int flags,const char *url)
-{
-	return 1;
-}
-
-int CDummyProto::SetApparentMode(MCONTACT hContact,int mode)
-{
-	return 1;
-}
-
-int CDummyProto::RecvAwayMsg(MCONTACT hContact,int mode,PROTORECVEVENT *evt)
-{
-	return 1;
-}
-
-HANDLE CDummyProto::GetAwayMsg(MCONTACT hContact)
-{
-	return 0;
-}
-
-int CDummyProto::SetAwayMsg(int status, const PROTOCHAR *msg)
-{
-	return 0;
-}
diff --git a/protocols/Dummy/src/dummy_proto.h b/protocols/Dummy/src/dummy_proto.h
index f6c98ea969..69e153b91a 100644
--- a/protocols/Dummy/src/dummy_proto.h
+++ b/protocols/Dummy/src/dummy_proto.h
@@ -26,49 +26,12 @@ struct CDummyProto : public PROTO<CDummyProto>
 	// PROTO_INTERFACE
 	//====================================================================================
 
-	virtual	MCONTACT  __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);
-	virtual	MCONTACT  __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent);
-
-	virtual	int       __cdecl Authorize(MEVENT hDbEvent);
-	virtual	int       __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR *szReason);
-	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);
-	virtual	int       __cdecl AuthRequest(MCONTACT hContact, const TCHAR *szMessage);
-
-	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);
-	virtual	int       __cdecl FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename);
-
 	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);
-	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);
-
-	virtual	HANDLE    __cdecl SearchBasic(const TCHAR *id);
-	virtual	HANDLE    __cdecl SearchByEmail(const TCHAR *email);
-	virtual	HANDLE    __cdecl SearchByName(const TCHAR *nick, const TCHAR *firstName, const TCHAR *lastName);
-	virtual	HWND      __cdecl SearchAdvanced(HWND owner);
-	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);
-
-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);
-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);
-	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);
-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);
 
-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);
-	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);
 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);
-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url);
 
-	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);
 	virtual	int       __cdecl SetStatus(int iNewStatus);
 
-	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);
-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt);
-	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const TCHAR *msg);
-
-	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);
-
-	virtual	int       __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam);
-
 	//==== Events ========================================================================
 
 	int __cdecl OnModulesLoaded(WPARAM, LPARAM);
@@ -83,5 +46,4 @@ struct CDummyProto : public PROTO<CDummyProto>
 	
 	char uniqueIdText[100];
 	char uniqueIdSetting[100];
-
 };
diff --git a/protocols/FacebookRM/facebook_10.vcxproj b/protocols/FacebookRM/facebook_10.vcxproj
index 469ed2f29e..4eaf93aa95 100644
--- a/protocols/FacebookRM/facebook_10.vcxproj
+++ b/protocols/FacebookRM/facebook_10.vcxproj
@@ -190,7 +190,6 @@
     <ClCompile Include="src\process.cpp" />

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

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

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

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

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

   </ItemGroup>

diff --git a/protocols/FacebookRM/facebook_10.vcxproj.filters b/protocols/FacebookRM/facebook_10.vcxproj.filters
index b27274028e..94f5cf0179 100644
--- a/protocols/FacebookRM/facebook_10.vcxproj.filters
+++ b/protocols/FacebookRM/facebook_10.vcxproj.filters
@@ -51,9 +51,6 @@
     <ClCompile Include="src\proto.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

-      <Filter>Source Files</Filter>

-    </ClCompile>

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

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/protocols/FacebookRM/facebook_12.vcxproj b/protocols/FacebookRM/facebook_12.vcxproj
index 541aa0c4b5..857c916868 100644
--- a/protocols/FacebookRM/facebook_12.vcxproj
+++ b/protocols/FacebookRM/facebook_12.vcxproj
@@ -193,7 +193,6 @@
     <ClCompile Include="src\process.cpp" />

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

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

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

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

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

   </ItemGroup>

diff --git a/protocols/FacebookRM/facebook_12.vcxproj.filters b/protocols/FacebookRM/facebook_12.vcxproj.filters
index b27274028e..94f5cf0179 100644
--- a/protocols/FacebookRM/facebook_12.vcxproj.filters
+++ b/protocols/FacebookRM/facebook_12.vcxproj.filters
@@ -51,9 +51,6 @@
     <ClCompile Include="src\proto.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

-      <Filter>Source Files</Filter>

-    </ClCompile>

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

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/protocols/FacebookRM/src/proto.h b/protocols/FacebookRM/src/proto.h
index 51a9bba0ee..59b5ce751c 100644
--- a/protocols/FacebookRM/src/proto.h
+++ b/protocols/FacebookRM/src/proto.h
@@ -76,42 +76,24 @@ public:
 	//PROTO_INTERFACE
 
 	virtual	MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);
-	virtual	MCONTACT __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent);
 
 	virtual	int      __cdecl Authorize(MEVENT hDbEvent);
 	virtual	int      __cdecl AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason);
-	virtual	int      __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);
 	virtual	int      __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage);
 
-	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);
-	virtual	int      __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename);
-
 	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);
 	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);
 
 	virtual	HANDLE    __cdecl SearchBasic(const PROTOCHAR* id);
 	virtual	HANDLE    __cdecl SearchByEmail(const PROTOCHAR* email);
 	virtual	HANDLE    __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName);
-	virtual	HWND      __cdecl SearchAdvanced(HWND owner);
-	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);
 
-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);
-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT*);
 	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);
-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);
-
-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);
-	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles);
 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);
-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url);
 
-	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);
 	virtual	int       __cdecl SetStatus(int iNewStatus);
 
 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);
-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt);
 	virtual	int       __cdecl SetAwayMsg(int iStatus, const PROTOCHAR* msg);
 
 	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);
diff --git a/protocols/FacebookRM/src/stubs.cpp b/protocols/FacebookRM/src/stubs.cpp
deleted file mode 100644
index 21a46121d1..0000000000
--- a/protocols/FacebookRM/src/stubs.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*

-

-Facebook plugin for Miranda Instant Messenger

-_____________________________________________

-

-Copyright © 2009-11 Michal Zelinka, 2011-15 Robert Pösel

-

-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, see <http://www.gnu.org/licenses/>.

-

-*/

-

-#include "common.h"

-

-MCONTACT FacebookProto::AddToListByEvent(int, int, MEVENT)

-{

-	return NULL;

-}

-

-int FacebookProto::AuthRecv(MCONTACT, PROTORECVEVENT *)

-{

-	return 1;

-}

-

-HANDLE FacebookProto::FileAllow(MCONTACT, HANDLE, const PROTOCHAR *)

-{

-	return NULL;

-}

-

-int FacebookProto::FileCancel(MCONTACT, HANDLE)

-{

-	return 1;

-}

-

-int FacebookProto::FileDeny(MCONTACT, HANDLE, const PROTOCHAR *)

-{

-	return 1;

-}

-

-int FacebookProto::FileResume(HANDLE, int *, const PROTOCHAR **)

-{

-	return 1;

-}

-

-HWND FacebookProto::SearchAdvanced(HWND)

-{

-	return NULL;

-}

-

-HWND FacebookProto::CreateExtendedSearchUI(HWND)

-{

-	return NULL;

-}

-

-int FacebookProto::RecvContacts(MCONTACT, PROTORECVEVENT *)

-{

-	return 1;

-}

-

-int FacebookProto::RecvFile(MCONTACT, PROTORECVFILET *)

-{

-	return 1;

-}

-

-int FacebookProto::RecvUrl(MCONTACT, PROTORECVEVENT *)

-{

-	return 1;

-}

-

-int FacebookProto::SendContacts(MCONTACT, int, int, MCONTACT *)

-{

-	return 1;

-}

-

-HANDLE FacebookProto::SendFile(MCONTACT, const PROTOCHAR *, PROTOCHAR **)

-{

-	return NULL;

-}

-

-int FacebookProto::SendUrl(MCONTACT, int, const char *)

-{

-	return 1;

-}

-

-int FacebookProto::SetApparentMode(MCONTACT, int)

-{

-	return 1;

-}

-

-int FacebookProto::RecvAwayMsg(MCONTACT, int, PROTORECVEVENT *)

-{

-	return 1;

-}

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index e2abec4873..4a55df086f 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -122,22 +122,6 @@ GGPROTO::~GGPROTO()
 }

 

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

-// Dummies for function that have to be implemented

-

-MCONTACT GGPROTO::AddToListByEvent(int flags, int iContact, MEVENT hDbEvent) { return NULL; }

-int      GGPROTO::Authorize(MEVENT hDbEvent) { return 1; }

-int      GGPROTO::AuthDeny(MEVENT 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; }

-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; }

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

-int      GGPROTO::SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList) { return 1; }

-int      GGPROTO::SendUrl(MCONTACT hContact, int flags, const char *url) { return 1; }

-int      GGPROTO::RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT *evt) { return 1; }

-

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

 // when contact is added to list

 

 MCONTACT GGPROTO::AddToList(int flags, PROTOSEARCHRESULT *psr)

@@ -567,14 +551,6 @@ HWND GGPROTO::CreateExtendedSearchUI(HWND owner)
 }

 

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

-// when messsage received

-

-int GGPROTO::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)

-{

-	return Proto_RecvMessage(hContact, pre);

-}

-

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

 // when messsage sent

 

 typedef struct

diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h
index 816292100c..b3bc689d46 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.h
+++ b/protocols/Gadu-Gadu/src/gg_proto.h
@@ -32,42 +32,28 @@ struct GGPROTO : public PROTO<GGPROTO>
 	//====================================================================================

 

 	virtual	MCONTACT __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );

-	virtual	MCONTACT __cdecl AddToListByEvent( int flags, int iContact, MEVENT hDbEvent );

 							 

-	virtual	int      __cdecl Authorize( MEVENT hDbEvent );

-	virtual	int      __cdecl AuthDeny( MEVENT hDbEvent, const TCHAR* szReason );

-	virtual	int      __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT* );

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

-

 	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 );

-	virtual	int      __cdecl FileResume( HANDLE hTransfer, int* action, const TCHAR** szFilename );

 

 	virtual	DWORD_PTR __cdecl GetCaps( int type, MCONTACT hContact = NULL );

 	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType );

 

 	virtual	HANDLE    __cdecl SearchBasic( const TCHAR* id );

-	virtual	HANDLE    __cdecl SearchByEmail( const TCHAR* email );

 	virtual	HANDLE    __cdecl SearchByName( const TCHAR* nick, const TCHAR* firstName, const TCHAR* lastName );

 	virtual	HWND      __cdecl SearchAdvanced( HWND owner );

 	virtual	HWND      __cdecl CreateExtendedSearchUI( HWND owner );

 

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT* );

 	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET* );

-	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT* );

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT* );

 

-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

 	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles );

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg );

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url );

 

 	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode );

 	virtual	int       __cdecl SetStatus( int iNewStatus );

 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact );

-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt );

 	virtual	int       __cdecl SetAwayMsg( int m_iStatus, const TCHAR* msg );

 

 	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type );

diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h
index 991a01988d..7af8860637 100644
--- a/protocols/IRCG/src/irc.h
+++ b/protocols/IRCG/src/irc.h
@@ -212,12 +212,9 @@ struct CIrcProto : public PROTO<CIrcProto>
 				// Protocol interface

 

 	virtual	MCONTACT  __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );

-	virtual	MCONTACT  __cdecl AddToListByEvent( int flags, int iContact, MEVENT hDbEvent );

 

 	virtual	int       __cdecl Authorize(MEVENT hDbEvent);

 	virtual	int       __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR* szReason);

-	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

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

 

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

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

@@ -225,33 +222,17 @@ struct CIrcProto : public PROTO<CIrcProto>
 	virtual	int       __cdecl FileResume( HANDLE hTransfer, int *action, const TCHAR **szFilename);

 

 	virtual	DWORD_PTR __cdecl GetCaps( int type, MCONTACT hContact = NULL);

-	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);

 

 	virtual	HANDLE    __cdecl SearchBasic(const PROTOCHAR* id);

-	virtual	HANDLE    __cdecl SearchByEmail(const PROTOCHAR* email);

-	virtual	HANDLE    __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName);

-	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

-	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);

-	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

-

-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

 	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url);

 

-	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT *evt);

 	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const TCHAR *msg);

 

-	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);

-

 	virtual	int       __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam);

 

 	// Services

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index 0a259851c1..7dd787fe5d 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -336,14 +336,6 @@ MCONTACT __cdecl CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr)
 }

 

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

-// AddToList - adds a contact to the contact list

-

-MCONTACT __cdecl CIrcProto::AddToListByEvent(int, int, MEVENT)

-{

-	return NULL;

-}

-

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

 // AuthAllow - processes the successful authorization

 

 int __cdecl CIrcProto::Authorize(MEVENT)

@@ -360,22 +352,6 @@ int __cdecl CIrcProto::AuthDeny(MEVENT, const TCHAR*)
 }

 

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

-// PSR_AUTH

-

-int __cdecl CIrcProto::AuthRecv(MCONTACT, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

-// PSS_AUTHREQUEST

-

-int __cdecl CIrcProto::AuthRequest(MCONTACT, const TCHAR*)

-{

-	return 1;

-}

-

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

 // FileAllow - starts a file transfer

 

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

@@ -500,14 +476,6 @@ DWORD_PTR __cdecl CIrcProto::GetCaps(int type, MCONTACT)
 }

 

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

-// GetInfo - retrieves a contact info

-

-int __cdecl CIrcProto::GetInfo(MCONTACT, int)

-{

-	return 1;

-}

-

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

 // SearchBasic - searches the contact by JID

 

 struct AckBasicSearchParam

@@ -542,72 +510,6 @@ HANDLE __cdecl CIrcProto::SearchBasic(const PROTOCHAR* szId)
 }

 

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

-// SearchByEmail - searches the contact by its e-mail

-

-HANDLE __cdecl CIrcProto::SearchByEmail(const PROTOCHAR*)

-{

-	return NULL;

-}

-

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

-// upsupported search functions

-

-HANDLE __cdecl CIrcProto::SearchByName(const PROTOCHAR*, const PROTOCHAR*, const PROTOCHAR*)

-{

-	return NULL;

-}

-

-HWND __cdecl CIrcProto::CreateExtendedSearchUI(HWND)

-{

-	return NULL;

-}

-

-HWND __cdecl CIrcProto::SearchAdvanced(HWND)

-{

-	return NULL;

-}

-

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

-// RecvContacts

-

-int __cdecl CIrcProto::RecvContacts(MCONTACT, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

-// RecvFile

-

-int __cdecl CIrcProto::RecvFile(MCONTACT hContact, PROTORECVFILET* evt)

-{

-	return Proto_RecvFile(hContact, evt);

-}

-

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

-// RecvMsg

-

-int __cdecl CIrcProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* evt)

-{

-	return Proto_RecvMessage(hContact, evt);

-}

-

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

-// RecvUrl

-

-int __cdecl CIrcProto::RecvUrl(MCONTACT, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

-// SendContacts

-

-int __cdecl CIrcProto::SendContacts(MCONTACT, int, int, MCONTACT*)

-{

-	return 1;

-}

-

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

 // SendFile - sends a file

 

 HANDLE __cdecl CIrcProto::SendFile(MCONTACT hContact, const TCHAR*, TCHAR** ppszFiles)

@@ -815,22 +717,6 @@ int __cdecl CIrcProto::SendMsg(MCONTACT hContact, int flags, const char* pszSrc)
 }

 

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

-// SendUrl

-

-int __cdecl CIrcProto::SendUrl(MCONTACT, int, const char*)

-{

-	return 1;

-}

-

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

-// SetApparentMode - sets the visibility status

-

-int __cdecl CIrcProto::SetApparentMode(MCONTACT, int)

-{

-	return 0;

-}

-

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

 // SetStatus - sets the protocol status

 

 int __cdecl CIrcProto::SetStatus(int iNewStatus)

@@ -929,14 +815,6 @@ HANDLE __cdecl CIrcProto::GetAwayMsg(MCONTACT hContact)
 }

 

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

-// PSR_AWAYMSG

-

-int __cdecl CIrcProto::RecvAwayMsg(MCONTACT, int, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

 // SetAwayMsg - sets the away status message

 

 int __cdecl CIrcProto::SetAwayMsg(int status, const TCHAR* msg)

@@ -964,14 +842,6 @@ int __cdecl CIrcProto::SetAwayMsg(int status, const TCHAR* msg)
 }

 

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

-// UserIsTyping - sends a UTN notification

-

-int __cdecl CIrcProto::UserIsTyping(MCONTACT, int)

-{

-	return 0;

-}

-

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

 // OnEvent - maintain protocol events

 

 int __cdecl CIrcProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam)

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index 43bd09ff40..45c3e87768 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -915,15 +915,6 @@ int __cdecl CIcqProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT* pre)
 

 

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

-// RecvFile

-

-int __cdecl CIcqProto::RecvFile(MCONTACT hContact, PROTORECVFILET* evt)

-{

-	return Proto_RecvFile(hContact, evt);

-}

-

-

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

 // RecvMsg

 

 int __cdecl CIcqProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)

@@ -949,15 +940,6 @@ int __cdecl CIcqProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)
 

 

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

-// RecvUrl

-

-int __cdecl CIcqProto::RecvUrl(MCONTACT, PROTORECVEVENT*)

-{

-	return 1;

-}

-

-

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

 // SendContacts

 

 int __cdecl CIcqProto::SendContacts(MCONTACT hContact, int, int nContacts, MCONTACT *hContactsList)

diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index 4634f68aae..97666e109d 100644
--- a/protocols/IcqOscarJ/src/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
@@ -77,9 +77,7 @@ struct CIcqProto : public PROTO<CIcqProto>
 	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

 	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);

 	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

 

 	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

 	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 271c51bed6..e9652107d4 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -467,22 +467,6 @@ int CJabberProto::AuthDeny(MEVENT hDbEvent, const TCHAR*)
 }

 

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

-// PSR_AUTH

-

-int __cdecl CJabberProto::AuthRecv(MCONTACT, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

-// PSS_AUTHREQUEST

-

-int __cdecl CJabberProto::AuthRequest(MCONTACT, const TCHAR*)

-{

-	return 1;

-}

-

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

 // JabberFileAllow - starts a file transfer

 

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

@@ -821,22 +805,6 @@ HANDLE __cdecl CJabberProto::SearchByName(const TCHAR *nick, const TCHAR *firstN
 }

 

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

-// RecvContacts

-

-int __cdecl CJabberProto::RecvContacts(MCONTACT, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

-// RecvFile

-

-int __cdecl CJabberProto::RecvFile(MCONTACT hContact, PROTORECVFILET *evt)

-{

-	return Proto_RecvFile(hContact, evt);

-}

-

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

 // RecvMsg

 

 int __cdecl CJabberProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt)

@@ -849,14 +817,6 @@ int __cdecl CJabberProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt)
 }

 

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

-// RecvUrl

-

-int __cdecl CJabberProto::RecvUrl(MCONTACT, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

 // SendContacts

 

 int __cdecl CJabberProto::SendContacts(MCONTACT hContact, int, int nContacts, MCONTACT *hContactsList)

@@ -1099,14 +1059,6 @@ int __cdecl CJabberProto::SendMsg(MCONTACT hContact, int flags, const char* pszS
 }

 

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

-// SendUrl

-

-int __cdecl CJabberProto::SendUrl(MCONTACT, int /*flags*/, const char* /*url*/)

-{

-	return 1;

-}

-

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

 // JabberSetApparentMode - sets the visibility status

 

 int __cdecl CJabberProto::SetApparentMode(MCONTACT hContact, int mode)

@@ -1247,14 +1199,6 @@ HANDLE __cdecl CJabberProto::GetAwayMsg(MCONTACT hContact)
 }

 

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

-// PSR_AWAYMSG

-

-int __cdecl CJabberProto::RecvAwayMsg(MCONTACT, int /*statusMode*/, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

 // JabberSetAwayMsg - sets the away status message

 

 int __cdecl CJabberProto::SetAwayMsg(int status, const TCHAR *msg)

diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index 81e50ade07..8c7ce2dc03 100644
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -87,8 +87,6 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 

 	virtual	int       __cdecl Authorize(MEVENT hDbEvent);

 	virtual	int       __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR *szReason);

-	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

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

 

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

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

@@ -104,21 +102,16 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

 	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);

 	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

 

 	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

 	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char *msg);

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char *url);

 

 	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt);

 	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const TCHAR *msg);

 

 	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);

diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index 8801b90ec0..89605d5631 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -182,14 +182,6 @@ MCONTACT CMraProto::AddToListByEvent(int, int, MEVENT hDbEvent)
 }

 

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

-// Stubs

-

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

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

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

-int CMraProto::SendUrl(MCONTACT, int, const char*) { return 1; }

-

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

 

 int CMraProto::Authorize(MEVENT hDBEvent)

 {

@@ -239,11 +231,6 @@ int CMraProto::AuthRecv(MCONTACT, PROTORECVEVENT* pre)
 	return 0;

 }

 

-int CMraProto::AuthRequest(MCONTACT, const TCHAR*)

-{

-	return 1;

-}

-

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

 

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

@@ -359,16 +346,6 @@ int CMraProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT* pre)
 	return 0;

 }

 

-int CMraProto::RecvFile(MCONTACT hContact, PROTORECVFILET *pre)

-{

-	return Proto_RecvFile(hContact, pre);

-}

-

-int CMraProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)

-{

-	return Proto_RecvMessage(hContact, pre);

-}

-

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

 

 int CMraProto::SendContacts(MCONTACT hContact, int, int nContacts, MCONTACT *hContactsList)

diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h
index 6fbab83126..236f6fca80 100644
--- a/protocols/MRA/src/MraProto.h
+++ b/protocols/MRA/src/MraProto.h
@@ -44,12 +44,10 @@ struct CMraProto : public PROTO<CMraProto>
 	virtual	int       __cdecl Authorize(MEVENT hDBEvent);

 	virtual	int       __cdecl AuthDeny(MEVENT hDBEvent, const TCHAR* szReason);

 	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

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

 

 	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);

-	virtual	int       __cdecl FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename);

 

 	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);

 	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);

@@ -61,20 +59,15 @@ struct CMraProto : public PROTO<CMraProto>
 	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

 	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);

-	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

 

 	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

 	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url);

 

 	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt);

 	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const TCHAR* msg);

 

 	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index b21c71a683..ab752712b4 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -448,22 +448,6 @@ HANDLE __cdecl CMsnProto::SearchByEmail(const PROTOCHAR* email)
 	return SearchBasic(email);

 }

 

-

-HANDLE __cdecl CMsnProto::SearchByName(const PROTOCHAR*, const PROTOCHAR*, const PROTOCHAR*)

-{

-	return NULL;

-}

-

-HWND __cdecl CMsnProto::SearchAdvanced(HWND)

-{

-	return NULL;

-}

-

-HWND __cdecl CMsnProto::CreateExtendedSearchUI(HWND)

-{

-	return NULL;

-}

-

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

 // MsnFileAllow - starts the file transfer

 

@@ -679,31 +663,6 @@ DWORD_PTR __cdecl CMsnProto::GetCaps(int type, MCONTACT)
 }

 

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

-// MsnGetInfo - nothing to do, cause we cannot obtain information from the server

-

-int __cdecl CMsnProto::GetInfo(MCONTACT, int)

-{

-	return 1;

-}

-

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

-// RecvContacts

-

-int __cdecl CMsnProto::RecvContacts(MCONTACT, PROTORECVEVENT*)

-{

-	return 1;

-}

-

-

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

-// MsnRecvFile - creates a database event from the file request been received

-

-int __cdecl CMsnProto::RecvFile(MCONTACT hContact, PROTOFILEEVENT* evt)

-{

-	return Proto_RecvFile(hContact, evt);

-}

-

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

 // MsnRecvMessage - creates a database event from the message been received

 

 int __cdecl CMsnProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)

@@ -717,22 +676,6 @@ int __cdecl CMsnProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)
 	return Proto_RecvMessage(hContact, pre);

 }

 

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

-// RecvUrl

-

-int __cdecl CMsnProto::RecvUrl(MCONTACT, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

-// SendContacts

-

-int __cdecl CMsnProto::SendContacts(MCONTACT, int, int, MCONTACT*)

-{

-	return 1;

-}

-

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

 // MsnSendFile - initiates a file transfer

 

@@ -941,14 +884,6 @@ int __cdecl CMsnProto::SetAwayMsg(int status, const TCHAR* msg)
 	return 0;

 }

 

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

-// PSR_AWAYMSG

-

-int __cdecl CMsnProto::RecvAwayMsg(MCONTACT, int, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

 // MsnSetStatus - set the plugin's connection status

 

@@ -1040,14 +975,6 @@ int __cdecl CMsnProto::UserIsTyping(MCONTACT hContact, int type)
 	return 0;

 }

 

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

-// SendUrl

-

-int __cdecl CMsnProto::SendUrl(MCONTACT, int, const char*)

-{

-	return 1;

-}

-

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

 //	MsnSetApparentMode - controls contact visibility

 

diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h
index 0600dc1d16..d8d26d3344 100644
--- a/protocols/MSN/src/msn_proto.h
+++ b/protocols/MSN/src/msn_proto.h
@@ -46,29 +46,19 @@ struct CMsnProto : public PROTO<CMsnProto>
 	virtual	int       __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename);

 

 	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);

-	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);

 

 	virtual	HANDLE    __cdecl SearchBasic(const PROTOCHAR* id);

 	virtual	HANDLE    __cdecl SearchByEmail(const PROTOCHAR* email);

-	virtual	HANDLE    __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName);

-	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

-	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT*);

 	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

 

-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

 	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles);

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url);

 

 	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt);

 	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const TCHAR* msg);

 

 	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);

diff --git a/protocols/Omegle/omegle_10.vcxproj b/protocols/Omegle/omegle_10.vcxproj
index 91eedf99fa..059aabe645 100644
--- a/protocols/Omegle/omegle_10.vcxproj
+++ b/protocols/Omegle/omegle_10.vcxproj
@@ -185,7 +185,6 @@
     <ClCompile Include="src\messages.cpp" />

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

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

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

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

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

   </ItemGroup>

diff --git a/protocols/Omegle/omegle_10.vcxproj.filters b/protocols/Omegle/omegle_10.vcxproj.filters
index 55ba1610e8..f789bbdbea 100644
--- a/protocols/Omegle/omegle_10.vcxproj.filters
+++ b/protocols/Omegle/omegle_10.vcxproj.filters
@@ -36,9 +36,6 @@
     <ClCompile Include="src\proto.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

-      <Filter>Source Files</Filter>

-    </ClCompile>

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

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/protocols/Omegle/omegle_12.vcxproj b/protocols/Omegle/omegle_12.vcxproj
index e8fb2237d7..6b19b04fa7 100644
--- a/protocols/Omegle/omegle_12.vcxproj
+++ b/protocols/Omegle/omegle_12.vcxproj
@@ -188,7 +188,6 @@
     <ClCompile Include="src\messages.cpp" />

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

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

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

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

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

   </ItemGroup>

diff --git a/protocols/Omegle/omegle_12.vcxproj.filters b/protocols/Omegle/omegle_12.vcxproj.filters
index 448fa96ba4..aecb742869 100644
--- a/protocols/Omegle/omegle_12.vcxproj.filters
+++ b/protocols/Omegle/omegle_12.vcxproj.filters
@@ -36,9 +36,6 @@
     <ClCompile Include="src\proto.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

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

-      <Filter>Source Files</Filter>

-    </ClCompile>

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

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp
index a1112ae7db..5dab83480b 100644
--- a/protocols/Omegle/src/proto.cpp
+++ b/protocols/Omegle/src/proto.cpp
@@ -206,8 +206,6 @@ int OmegleProto::OnPreShutdown(WPARAM wParam,LPARAM lParam)
 

 int OmegleProto::OnContactDeleted(WPARAM wparam,LPARAM)

 {

-	//MCONTACT hContact = (MCONTACT)wparam;

-

 	OnLeaveChat(NULL, NULL);

 	return 0;

 }

diff --git a/protocols/Omegle/src/proto.h b/protocols/Omegle/src/proto.h
index 9c6fc833d0..697bb4cd52 100644
--- a/protocols/Omegle/src/proto.h
+++ b/protocols/Omegle/src/proto.h
@@ -44,45 +44,13 @@ public:
 	}

 

 	// PROTO_INTERFACE

-	virtual	MCONTACT __cdecl AddToList( int flags, PROTOSEARCHRESULT* psr );

-	virtual	MCONTACT __cdecl AddToListByEvent( int flags, int iContact, MEVENT hDbEvent );

-

-	virtual	int      __cdecl Authorize( MEVENT hDbEvent );

-	virtual	int      __cdecl AuthDeny( MEVENT hDbEvent, const PROTOCHAR* szReason );

-	virtual	int      __cdecl AuthRecv( MCONTACT hContact, PROTORECVEVENT* );

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

-

-	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 );

-	virtual	int      __cdecl FileResume( HANDLE hTransfer, int* action, const PROTOCHAR** szFilename );

 

 	virtual	DWORD_PTR __cdecl GetCaps( int type, MCONTACT hContact = NULL );

-	virtual	int       __cdecl GetInfo( MCONTACT hContact, int infoType );

-

-	virtual	HANDLE    __cdecl SearchBasic( const PROTOCHAR* id );

-	virtual	HANDLE    __cdecl SearchByEmail( const PROTOCHAR* email );

-	virtual	HANDLE    __cdecl SearchByName( const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName );

-	virtual	HWND      __cdecl SearchAdvanced( HWND owner );

-	virtual	HWND      __cdecl CreateExtendedSearchUI( HWND owner );

 

-	virtual	int       __cdecl RecvContacts( MCONTACT hContact, PROTORECVEVENT* );

-	virtual	int       __cdecl RecvFile( MCONTACT hContact, PROTOFILEEVENT* );

-	virtual	int       __cdecl RecvMsg( MCONTACT hContact, PROTORECVEVENT* );

-	virtual	int       __cdecl RecvUrl( MCONTACT hContact, PROTORECVEVENT* );

-

-	virtual	int       __cdecl SendContacts( MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList );

-	virtual	HANDLE    __cdecl SendFile( MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles );

 	virtual	int       __cdecl SendMsg( MCONTACT hContact, int flags, const char* msg );

-	virtual	int       __cdecl SendUrl( MCONTACT hContact, int flags, const char* url );

 

-	virtual	int       __cdecl SetApparentMode( MCONTACT hContact, int mode );

 	virtual	int       __cdecl SetStatus( int iNewStatus );

 

-	virtual	HANDLE    __cdecl GetAwayMsg( MCONTACT hContact );

-	virtual	int       __cdecl RecvAwayMsg( MCONTACT hContact, int mode, PROTORECVEVENT* evt );

-	virtual	int       __cdecl SetAwayMsg( int iStatus, const PROTOCHAR* msg );

-

 	virtual	int       __cdecl UserIsTyping( MCONTACT hContact, int type );

 

 	virtual	int       __cdecl OnEvent( PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam );

diff --git a/protocols/Omegle/src/stubs.cpp b/protocols/Omegle/src/stubs.cpp
deleted file mode 100644
index 3242e4fdeb..0000000000
--- a/protocols/Omegle/src/stubs.cpp
+++ /dev/null
@@ -1,158 +0,0 @@
-/*

-

-Omegle plugin for Miranda Instant Messenger

-_____________________________________________

-

-Copyright © 2011-15 Robert Pösel

-

-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, see <http://www.gnu.org/licenses/>.

-

-*/

-

-#include "common.h"

-

-MCONTACT OmegleProto::AddToList(int flags, PROTOSEARCHRESULT* psr)

-{

-	return NULL;

-};

-

-MCONTACT OmegleProto::AddToListByEvent(int flags,int iContact,MEVENT hDbEvent)

-{

-	return NULL;

-};

-

-int OmegleProto::Authorize(MEVENT hDbEvent)

-{

-	return 1;

-}

-

-int OmegleProto::AuthDeny(MEVENT hDbEvent,const PROTOCHAR *reason)

-{

-	return 1;

-}

-

-int OmegleProto::AuthRecv(MCONTACT hContact,PROTORECVEVENT *)

-{

-	return 1;

-}

-

-int OmegleProto::AuthRequest(MCONTACT hContact,const PROTOCHAR *message)

-{

-	return 1;

-}

-

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

-{

-	return NULL;

-}

-

-int OmegleProto::FileCancel(MCONTACT hContact,HANDLE hTransfer)

-{

-	return 1;

-}

-

-int OmegleProto::FileDeny(MCONTACT hContact,HANDLE hTransfer,const PROTOCHAR *reason)

-{

-	return 1;

-}

-

-int OmegleProto::FileResume(HANDLE hTransfer,int *action,const PROTOCHAR **filename)

-{

-	return 1;

-}

-

-int OmegleProto::GetInfo( MCONTACT hContact, int infoType )

-{

-	return 1;

-}

-

-HANDLE OmegleProto::SearchBasic( const PROTOCHAR* id )

-{

-	return NULL;

-}

-

-HANDLE OmegleProto::SearchByEmail( const PROTOCHAR* email )

-{

-	return NULL;

-}

-

-HANDLE OmegleProto::SearchByName( const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName )

-{

-	return NULL;

-}

-

-HWND OmegleProto::SearchAdvanced(HWND owner)

-{

-	return NULL;

-}

-

-HWND OmegleProto::CreateExtendedSearchUI(HWND owner)

-{

-	return NULL;

-}

-

-int OmegleProto::RecvContacts(MCONTACT hContact,PROTORECVEVENT *)

-{

-	return 1;

-}

-

-int OmegleProto::RecvFile(MCONTACT hContact,PROTORECVFILET *)

-{

-	return 1;

-}

-

-int OmegleProto::RecvUrl(MCONTACT hContact,PROTORECVEVENT *)

-{

-	return 1;

-}

-

-int OmegleProto::SendContacts(MCONTACT hContact,int flags,int nContacts,MCONTACT *hContactsList)

-{

-	return 1;

-}

-

-HANDLE OmegleProto::SendFile(MCONTACT hContact,const PROTOCHAR *desc, PROTOCHAR **files)

-{

-	return NULL;

-}

-

-int OmegleProto::SendUrl(MCONTACT hContact,int flags,const char *url)

-{

-	return 1;

-}

-

-int OmegleProto::SetApparentMode(MCONTACT hContact,int mode)

-{

-	return 1;

-}

-

-int OmegleProto::RecvAwayMsg(MCONTACT hContact,int mode,PROTORECVEVENT *evt)

-{

-	return 1;

-}

-

-int OmegleProto::SetAwayMsg(int iStatus, const PROTOCHAR* msg)

-{

-	return 1;

-}

-

-HANDLE OmegleProto::GetAwayMsg( MCONTACT hContact )

-{

-	return NULL;

-}

-

-int OmegleProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)

-{

-	return 1;

-}

diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp
index f5e2352e9e..9ee51096e7 100644
--- a/protocols/Sametime/src/sametime_proto.cpp
+++ b/protocols/Sametime/src/sametime_proto.cpp
@@ -89,36 +89,6 @@ MCONTACT CSametimeProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
 	return AddSearchedUser(sr, flags & PALF_TEMPORARY);

 }

 

-MCONTACT CSametimeProto::AddToListByEvent(int flags, int iContact, MEVENT hDbEvent)

-{

-	debugLog(_T("CSametimeProto::AddToListByEvent()  flags=[%d]"), flags);

-	return 0;

-}

-

-int CSametimeProto::Authorize(MEVENT hDbEvent)

-{

-	debugLog(_T("CSametimeProto::Authorize()"));

-	return 1;

-}

-

-int CSametimeProto::AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason)

-{

-	debugLog(_T("CSametimeProto::AuthDeny()"));

-	return 1;

-}

-

-int CSametimeProto::AuthRecv(MCONTACT hContact, PROTORECVEVENT*)

-{

-	debugLog(_T("CSametimeProto::AuthRecv()"));

-	return 1;

-}

-

-int CSametimeProto::AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage)

-{

-	debugLog(_T("CSametimeProto::AuthRequest()"));

-	return 1;

-}

-

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

 {

 	debugLog(_T("CSametimeProto::FileAllow()  hContact=[%x], szPath=[%s]"), hContact, szPath);

@@ -210,16 +180,6 @@ HANDLE CSametimeProto::SearchBasic(const PROTOCHAR* id)
 	///TODO - add timeout (like at GGPROTO::searchthread)

 }

 

-HANDLE CSametimeProto::SearchByEmail(const PROTOCHAR* email)

-{

-	return 0;

-}

-

-HANDLE CSametimeProto::SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName)

-{

-	return 0;

-}

-

 HWND CSametimeProto::SearchAdvanced(HWND owner)

 {

 	TCHAR buf[512];

@@ -240,12 +200,6 @@ HWND CSametimeProto::CreateExtendedSearchUI(HWND owner)
 }

 

 

-int CSametimeProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT*)

-{

-	debugLog(_T("CSametimeProto::RecvContacts()"));

-	return 1;

-}

-

 int CSametimeProto::RecvFile(MCONTACT hContact, PROTOFILEEVENT* pre)

 {

 	debugLog(_T("CSametimeProto::RecvFile()  hContact=[%x]"), hContact);

@@ -266,18 +220,6 @@ int CSametimeProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)
 	return Proto_RecvMessage(hContact, pre);

 }

 

-int CSametimeProto::RecvUrl(MCONTACT hContact, PROTORECVEVENT*)

-{

-	debugLog(_T("CSametimeProto::RecvUrl()"));

-	return 1;

-}

-

-int CSametimeProto::SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT* hContactsList)

-{

-	debugLog(_T("CSametimeProto::SendContacts()    flags=[%d], nContacts=[%d]"), flags, nContacts);

-	return 1;

-}

-

 HANDLE CSametimeProto::SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles)

 {

 	debugLog(_T("CSametimeProto::SendFile()  hContact=[%x]"), hContact);

@@ -330,18 +272,6 @@ int CSametimeProto::SendMsg(MCONTACT hContact, int flags, const char* msg)
 	return ret;

 }

 

-int CSametimeProto::SendUrl(MCONTACT hContact, int flags, const char* url)

-{

-	debugLog(_T("CSametimeProto::SendUrl()"));

-	return 1;

-}

-

-int CSametimeProto::SetApparentMode(MCONTACT hContact, int mode)

-{

-	debugLog(_T("CSametimeProto::SetApparentMode()    mode=[%d]"), mode);

-	return 1;

-}

-

 int CSametimeProto::SetStatus(int iNewStatus)

 {

 	debugLog(_T("CSametimeProto::SetStatus()  m_iStatus=[%d], m_iDesiredStatus=[%d], iNewStatus=[%d]"), m_iStatus, m_iDesiredStatus, iNewStatus);

diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h
index c56e291c84..7a68ae3e33 100644
--- a/protocols/Sametime/src/sametime_proto.h
+++ b/protocols/Sametime/src/sametime_proto.h
@@ -16,12 +16,6 @@ struct CSametimeProto : public PROTO<CSametimeProto>
 

 

 	virtual	MCONTACT  __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);

-	virtual	MCONTACT  __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent);

-

-	virtual	int       __cdecl Authorize(MEVENT hDbEvent);

-	virtual	int       __cdecl AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason);

-	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

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

 

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

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

@@ -32,22 +26,15 @@ struct CSametimeProto : public PROTO<CSametimeProto>
 	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);

 

 	virtual	HANDLE    __cdecl SearchBasic(const PROTOCHAR* id);

-	virtual	HANDLE    __cdecl SearchByEmail(const PROTOCHAR* email);

-	virtual	HANDLE    __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName);

 	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

 	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT*);

 	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

 

-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT* hContactsList);

 	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles);

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url);

 

-	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp
index 8a80a2e235..d096beeac6 100644
--- a/protocols/Steam/src/steam_proto.cpp
+++ b/protocols/Steam/src/steam_proto.cpp
@@ -105,11 +105,6 @@ MCONTACT __cdecl CSteamProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
 	return hContact;
 }
 
-MCONTACT __cdecl CSteamProto::AddToListByEvent(int flags, int iContact, MEVENT hDbEvent)
-{
-	return 0;
-}
-
 int __cdecl CSteamProto::Authorize(MEVENT hDbEvent)
 {
 	if (IsOnline() && hDbEvent)
@@ -164,11 +159,6 @@ int __cdecl CSteamProto::AuthDeny(MEVENT hDbEvent, const TCHAR* szReason)
 	return 1;
 }
 
-int __cdecl CSteamProto::AuthRecv(MCONTACT hContact, PROTORECVEVENT* pre)
-{
-	return 0;
-}
-
 int __cdecl CSteamProto::AuthRequest(MCONTACT hContact, const TCHAR* szMessage)
 {
 	if (IsOnline() && hContact)
@@ -209,26 +199,6 @@ int __cdecl CSteamProto::AuthRequest(MCONTACT hContact, const TCHAR* szMessage)
 	return 1;
 }
 
-HANDLE __cdecl CSteamProto::FileAllow(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szPath)
-{ 
-	return 0;
-}
-
-int __cdecl CSteamProto::FileCancel(MCONTACT hContact, HANDLE hTransfer)
-{
-	return 0;
-}
-
-int __cdecl CSteamProto::FileDeny(MCONTACT hContact, HANDLE hTransfer, const TCHAR* szReason)
-{
-	return 0;
-}
-
-int __cdecl CSteamProto::FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename)
-{
-	return 0;
-}
-
 DWORD_PTR __cdecl CSteamProto:: GetCaps(int type, MCONTACT hContact)
 {
 	switch(type)
@@ -252,8 +222,6 @@ DWORD_PTR __cdecl CSteamProto:: GetCaps(int type, MCONTACT hContact)
 	}
 }
 
-int __cdecl CSteamProto::GetInfo(MCONTACT hContact, int infoType ) { return 0; }
-
 HANDLE __cdecl CSteamProto::SearchBasic(const TCHAR* id)
 {
 	if (!this->IsOnline())
@@ -273,63 +241,11 @@ HANDLE __cdecl CSteamProto::SearchBasic(const TCHAR* id)
 	return (HANDLE)STEAM_SEARCH_BYID;
 }
 
-HANDLE __cdecl CSteamProto::SearchByEmail(const TCHAR* email)
-{
-	return 0;
-}
-
-HANDLE __cdecl CSteamProto::SearchByName(const TCHAR* nick, const TCHAR* firstName, const TCHAR* lastName)
-{
-	//if (!this->IsOnline())
-		return 0;
-
-	/*ptrA token(getStringA("TokenSecret"));
-
-	CMString keywords;
-	keywords.AppendFormat(L" %s", nick);
-	keywords.AppendFormat(L" %s", firstName);
-	keywords.AppendFormat(L" %s", lastName);
-	keywords.Trim();
-
-	//ForkThread(&CSteamProto::SearchByNameThread, ptrT(mir_tstrdup(keywords)));
-	PushRequest(
-		new SteamWebApi::SearchRequest(token, ptrT(mir_utf8encodeT(keywords))),
-		&CSteamProto::OnSearchByNameStarted);
-
-	return (HANDLE)STEAM_SEARCH_BYNAME;*/
-}
-
-HWND __cdecl CSteamProto::SearchAdvanced( HWND owner ) { return 0; }
-
-HWND __cdecl CSteamProto::CreateExtendedSearchUI( HWND owner ){ return 0; }
-
-int __cdecl CSteamProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT* pre) 
-{
-	return 0;
-}
-
-int __cdecl CSteamProto::RecvFile(MCONTACT hContact, PROTORECVFILET* pre) 
-{
-	return 0;
-}
-
 int __cdecl CSteamProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)
 {
 	return (INT_PTR)AddDBEvent(hContact, EVENTTYPE_MESSAGE, pre->timestamp, DBEF_UTF, lstrlenA(pre->szMessage), (BYTE*)pre->szMessage);
 }
 
-int __cdecl CSteamProto::RecvUrl(MCONTACT hContact, PROTORECVEVENT *) { return 0; }
-
-int __cdecl CSteamProto::SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList)
-{
-	return 0;
-}
-
-HANDLE __cdecl CSteamProto::SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles)
-{
-	return 0;
-}
-
 int __cdecl CSteamProto::SendMsg(MCONTACT hContact, int flags, const char *msg)
 {
 	UINT hMessage = InterlockedIncrement(&hMessageProcess);
@@ -369,10 +285,6 @@ void __cdecl CSteamProto::SendMsgThread(void *arg)
 		ARG_MIR_FREE);
 }
 
-int __cdecl CSteamProto::SendUrl(MCONTACT hContact, int flags, const char *url) { return 0; }
-
-int __cdecl CSteamProto::SetApparentMode(MCONTACT hContact, int mode) { return 0; }
-
 int CSteamProto::SetStatus(int new_status)
 {
 	mir_cslock lock(set_status_lock);
@@ -431,15 +343,6 @@ int CSteamProto::SetStatus(int new_status)
 	return 0;
 }
 
-HANDLE __cdecl CSteamProto::GetAwayMsg(MCONTACT hContact) { return 0; }
-int __cdecl CSteamProto::RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT *evt) { return 0; }
-int __cdecl CSteamProto::SetAwayMsg(int m_iStatus, const TCHAR *msg) { return 0; }
-
-int __cdecl CSteamProto::UserIsTyping(MCONTACT hContact, int type)
-{
-	return 0;
-}
-
 int __cdecl CSteamProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam)
 {
 	switch (eventType) {
diff --git a/protocols/Steam/src/steam_proto.h b/protocols/Steam/src/steam_proto.h
index 514410caea..34560349e8 100644
--- a/protocols/Steam/src/steam_proto.h
+++ b/protocols/Steam/src/steam_proto.h
@@ -125,46 +125,21 @@ public:
 

 	// PROTO_INTERFACE

 	virtual	MCONTACT  __cdecl AddToList(int flags, PROTOSEARCHRESULT *psr);

-	virtual	MCONTACT  __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent);

 

 	virtual	int       __cdecl Authorize(MEVENT hDbEvent);

 	virtual	int       __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR *szReason);

-	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT *);

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

 

-	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);

-	virtual	int       __cdecl FileResume(HANDLE hTransfer, int *action, const TCHAR** szFilename);

-

 	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);

-	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);

 

 	virtual	HANDLE    __cdecl SearchBasic(const TCHAR *id);

-	virtual	HANDLE    __cdecl SearchByEmail(const TCHAR *email);

-	virtual	HANDLE    __cdecl SearchByName(const TCHAR *nick, const TCHAR *firstName, const TCHAR *lastName);

-	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

-	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);

 	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

 

-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

-	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles);

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url);

 

-	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

-	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt);

-	virtual	int       __cdecl SetAwayMsg(int m_iStatus, const TCHAR* msg);

-

-	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);

-

 	virtual	int       __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam);

 

 	// instances

diff --git a/protocols/Tox/src/tox_proto.cpp b/protocols/Tox/src/tox_proto.cpp
index 39ffad7c39..045cf3117e 100644
--- a/protocols/Tox/src/tox_proto.cpp
+++ b/protocols/Tox/src/tox_proto.cpp
@@ -78,20 +78,15 @@ MCONTACT __cdecl CToxProto::AddToList(int flags, PROTOSEARCHRESULT *psr)
 	return AddContact(address.c_str(), _T(""), flags & PALF_TEMPORARY);

 }

 

-MCONTACT __cdecl CToxProto::AddToListByEvent(int, int, MEVENT) { return 0; }

-

 int __cdecl CToxProto::Authorize(MEVENT hDbEvent)

 {

 	MCONTACT hContact = GetContactFromAuthEvent(hDbEvent);

 	if (hContact == INVALID_CONTACT_ID)

-	{

 		return 1;

-	}

+

 	return OnGrantAuth(hContact, 0);

 }

 

-int __cdecl CToxProto::AuthDeny(MEVENT, const PROTOCHAR*) { return 0; }

-

 int __cdecl CToxProto::AuthRecv(MCONTACT, PROTORECVEVENT* pre)

 {

 	return Proto_AuthRecv(m_szModuleName, pre);

@@ -103,16 +98,6 @@ int __cdecl CToxProto::AuthRequest(MCONTACT hContact, const PROTOCHAR *szMessage
 	return OnRequestAuth(hContact, (LPARAM)reason);

 }

 

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

-

-int __cdecl CToxProto::GetInfo(MCONTACT, int) { return 0; }

-

-HANDLE __cdecl CToxProto::SearchBasic(const PROTOCHAR*) { return 0; }

-

-HANDLE __cdecl CToxProto::SearchByEmail(const PROTOCHAR*) { return 0; }

-

-HANDLE __cdecl CToxProto::SearchByName(const PROTOCHAR*, const PROTOCHAR*, const PROTOCHAR*) { return 0; }

-

 HWND __cdecl CToxProto::SearchAdvanced(HWND owner)

 {

 	return OnSearchAdvanced(owner);

@@ -123,37 +108,20 @@ HWND __cdecl CToxProto::CreateExtendedSearchUI(HWND owner)
 	return OnCreateExtendedSearchUI(owner);

 }

 

-int __cdecl CToxProto::RecvContacts(MCONTACT, PROTORECVEVENT*) { return 0; }

-

-int __cdecl CToxProto::RecvFile(MCONTACT hContact, PROTOFILEEVENT *pre)

-{

-	return Proto_RecvFile(hContact, pre);

-}

-

 int __cdecl CToxProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)

 {

 	return OnReceiveMessage(hContact, pre);

 }

 

-int __cdecl CToxProto::RecvUrl(MCONTACT, PROTORECVEVENT*) { return 0; }

-

-int __cdecl CToxProto::SendContacts(MCONTACT, int, int, MCONTACT*) { return 0; }

-

 int CToxProto::SendMsg(MCONTACT hContact, int flags, const char *msg)

 {

 	return OnSendMessage(hContact, flags, msg);

 }

 

-int __cdecl CToxProto::SendUrl(MCONTACT, int, const char*) { return 0; }

-

-int __cdecl CToxProto::SetApparentMode(MCONTACT, int) { return 0; }

-

 int __cdecl CToxProto::SetStatus(int iNewStatus)

 {

 	if (iNewStatus == m_iDesiredStatus)

-	{

 		return 0;

-	}

 

 	switch (iNewStatus)

 	{

@@ -223,8 +191,6 @@ int __cdecl CToxProto::SetStatus(int iNewStatus)
 

 HANDLE __cdecl CToxProto::GetAwayMsg(MCONTACT) { return 0; }

 

-int __cdecl CToxProto::RecvAwayMsg(MCONTACT, int, PROTORECVEVENT*) { return 0; }

-

 int __cdecl CToxProto::SetAwayMsg(int, const PROTOCHAR *msg)

 {

 	if (IsOnline())

@@ -257,4 +223,4 @@ int __cdecl CToxProto::OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM
 	}

 

 	return 1;

-}
\ No newline at end of file
+}

diff --git a/protocols/Tox/src/tox_proto.h b/protocols/Tox/src/tox_proto.h
index fc6e089f84..39b67e761f 100644
--- a/protocols/Tox/src/tox_proto.h
+++ b/protocols/Tox/src/tox_proto.h
@@ -15,44 +15,29 @@ public:
 	// Virtual functions

 

 	virtual	MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);

-	virtual	MCONTACT __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent);

 

 	virtual	int      __cdecl Authorize(MEVENT hDbEvent);

-	virtual	int      __cdecl AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason);

 	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* tszPath);

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

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

 	virtual	int      __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** tszFilename);

 

 	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);

-	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType);

-

-	virtual	HANDLE    __cdecl SearchBasic(const PROTOCHAR* id);

-	virtual	HANDLE    __cdecl SearchByEmail(const PROTOCHAR* email);

-	virtual	HANDLE    __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName);

+	

 	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

 	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT*);

 	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

-

-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

-	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR *szDescription, PROTOCHAR **ppszFiles);

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url);

 

-	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

+	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR*, PROTOCHAR **ppszFiles);

+

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt);

 	virtual	int       __cdecl SetAwayMsg(int iStatus, const PROTOCHAR* msg);

 

 	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);

diff --git a/protocols/VKontakte/src/vk_files.cpp b/protocols/VKontakte/src/vk_files.cpp
index 5758f2b429..aeb92164dc 100644
--- a/protocols/VKontakte/src/vk_files.cpp
+++ b/protocols/VKontakte/src/vk_files.cpp
@@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #include "stdafx.h"

 

-HANDLE CVkProto::FileAllow(MCONTACT, HANDLE, const PROTOCHAR*) { return NULL; }

-int CVkProto::FileCancel(MCONTACT, HANDLE) {	return 1; }

-int CVkProto::FileDeny(MCONTACT, HANDLE, const PROTOCHAR*) { return 1; }

-int CVkProto::FileResume(HANDLE, int*, const PROTOCHAR**) { return 1; }

-int CVkProto::RecvFile(MCONTACT, PROTORECVFILET *) { return 1; }

-

 CVkFileUploadParam::CVkFileUploadParam(MCONTACT _hContact, const PROTOCHAR* _desc, PROTOCHAR** _files) :

 hContact(_hContact), filetype(typeInvalid), atr(NULL), fname(NULL), iErrorCode(0)

 {

@@ -377,4 +371,4 @@ void CVkProto::OnReciveUploadFile(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pR
 	pMsgReq->pUserInfo = new CVkSendMsgParam(fup->hContact, -1, (int)pReq->pUserInfo);

 	

 	Push(pMsgReq);

-}
\ No newline at end of file
+}

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 2c13cc782a..b2465541dd 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -620,13 +620,3 @@ int CVkProto::GetInfo(MCONTACT hContact, int)
 	RetrieveUserInfo(userID);

 	return 0;

 }

-

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

-MCONTACT CVkProto::AddToListByEvent(int, int, MEVENT) {	return NULL; }

-int CVkProto::AuthRecv(MCONTACT, PROTORECVEVENT *) { return 1; }

-int CVkProto::RecvContacts(MCONTACT, PROTORECVEVENT *) { return 1; }

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

-int CVkProto::SendContacts(MCONTACT, int, int, MCONTACT*) {	return 1; }

-int CVkProto::SendUrl(MCONTACT, int, const char*) {	return 1; }

-int CVkProto::SetApparentMode(MCONTACT, int) { return 1; }

-//////////////////////////////////////////////////////////////////////////////
\ No newline at end of file
diff --git a/protocols/VKontakte/src/vk_proto.h b/protocols/VKontakte/src/vk_proto.h
index 933992a5f3..cb85df89a7 100644
--- a/protocols/VKontakte/src/vk_proto.h
+++ b/protocols/VKontakte/src/vk_proto.h
@@ -255,44 +255,25 @@ struct CVkProto : public PROTO<CVkProto>
 	//====================================================================================

 

 	virtual	MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);

-	virtual	MCONTACT __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent);

 

 	virtual	int __cdecl Authorize(MEVENT hDbEvent);

 	virtual	int __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR *szReason);

-	virtual	int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*);

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

 

-	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);

-	virtual	int __cdecl FileResume(HANDLE hTransfer, int* action, const TCHAR** szFilename);

-

 	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);

 	virtual	int __cdecl GetInfo(MCONTACT hContact, int infoType);

 

 	virtual	HANDLE __cdecl SearchBasic(const TCHAR *id);

 	virtual	HANDLE __cdecl SearchByEmail(const TCHAR *email);

 	virtual	HANDLE __cdecl SearchByName(const TCHAR *nick, const TCHAR *firstName, const TCHAR *lastName);

-	virtual	HWND __cdecl SearchAdvanced(HWND owner);

-	virtual	HWND __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);

 	virtual	int __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

+	virtual	int __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

 

-	virtual	int __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

 	virtual	HANDLE __cdecl SendFile(MCONTACT hContact, const TCHAR *szDescription, TCHAR **ppszFiles);

-	virtual	int __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

-	virtual	int __cdecl SendUrl(MCONTACT hContact, int flags, const char* url);

 

-	virtual	int __cdecl SetApparentMode(MCONTACT hContact, int mode);

 	virtual	int __cdecl SetStatus(int iNewStatus);

 

-	virtual	HANDLE __cdecl GetAwayMsg(MCONTACT hContact);

-	virtual	int __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt);

-	virtual	int __cdecl SetAwayMsg(int m_iStatus, const TCHAR *msg);

-

 	virtual	int __cdecl UserIsTyping(MCONTACT hContact, int type);

 

 	virtual	int __cdecl OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam);

diff --git a/protocols/VKontakte/src/vk_search.cpp b/protocols/VKontakte/src/vk_search.cpp
index c7e919dec4..924a6f593c 100644
--- a/protocols/VKontakte/src/vk_search.cpp
+++ b/protocols/VKontakte/src/vk_search.cpp
@@ -17,9 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #include "stdafx.h"

 

-HWND CVkProto::SearchAdvanced(HWND) { return NULL; }

-HWND CVkProto::CreateExtendedSearchUI(HWND) { return NULL; }

-

 HANDLE CVkProto::SearchBasic(const PROTOCHAR* id)

 {

 	ForkThread(&CVkProto::SearchBasicThread, (void *)id);

diff --git a/protocols/VKontakte/src/vk_status.cpp b/protocols/VKontakte/src/vk_status.cpp
index 256a1a9e47..6e9670e13d 100644
--- a/protocols/VKontakte/src/vk_status.cpp
+++ b/protocols/VKontakte/src/vk_status.cpp
@@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 

 #include "stdafx.h"

 

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

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

-HANDLE CVkProto::GetAwayMsg(MCONTACT) {	return 0; }

-int CVkProto::SetAwayMsg(int, const PROTOCHAR*) { return 0; }

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

-

 int CVkProto::SetStatus(int iNewStatus)

 {

 	debugLogA("CVkProto::SetStatus iNewStatus = %d, m_iStatus = %d, m_iDesiredStatus = %d m_hWorkerThread = %d", iNewStatus, m_iStatus, m_iDesiredStatus, m_hWorkerThread == NULL ? 0 : 1);

diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp
index f41519a172..dd01ffac5b 100644
--- a/protocols/WhatsApp/src/proto.cpp
+++ b/protocols/WhatsApp/src/proto.cpp
@@ -180,17 +180,6 @@ MCONTACT WhatsAppProto::AddToList(int flags, PROTOSEARCHRESULT* psr)
 	return hContact;

 }

 

-int WhatsAppProto::AuthRequest(MCONTACT hContact, const PROTOCHAR *message)

-{

-	RequestFriendship(hContact);

-	return 0;

-}

-

-int WhatsAppProto::Authorize(MEVENT hDbEvent)

-{

-	return 1;

-}

-

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

 

 void WhatsAppProto::SearchAckThread(void *targ)

diff --git a/protocols/WhatsApp/src/proto.h b/protocols/WhatsApp/src/proto.h
index e3e47e5ba1..78b58ea07b 100644
--- a/protocols/WhatsApp/src/proto.h
+++ b/protocols/WhatsApp/src/proto.h
@@ -41,45 +41,17 @@ public:
 	// PROTO_INTERFACE ///////////////////////////////////////////////////////////////////

 

 	virtual	MCONTACT  __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr);

-	virtual	MCONTACT  __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent) { return NULL; }

-

-	virtual	int       __cdecl Authorize(MEVENT hDbEvent);

-	virtual	int       __cdecl AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason) { return 1; }

-	virtual	int       __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*) { return 1; }

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

-

-	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; }

-	virtual	int       __cdecl FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename) { return 1; }

 

 	virtual	DWORD_PTR __cdecl GetCaps(int type, MCONTACT hContact = NULL);

-	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType) { return 1; }

 

 	virtual	HANDLE    __cdecl SearchBasic(const PROTOCHAR* id);

-	virtual	HANDLE    __cdecl SearchByEmail(const PROTOCHAR* email) { return NULL; }

-	virtual	HANDLE    __cdecl SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName) { return NULL; }

-	virtual	HWND      __cdecl SearchAdvanced(HWND owner) { return NULL; }

-	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner) { return NULL; }

 

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*) { return 1; }

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTOFILEEVENT*) { return 1; }

 	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*) { return 1; }

 

-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList) { return 1; }

-	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR* szDescription, PROTOCHAR** ppszFiles) { return NULL; }

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg);

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url) { return 1; }

 

-	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode) { return 1; }

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

-	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact) { return NULL; }

-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt) { return 1; }

-	virtual	int       __cdecl SendAwayMsg(MCONTACT hContact, HANDLE hProcess, const char* msg) { return 1; }

-	virtual	int       __cdecl SetAwayMsg(int iStatus, const PROTOCHAR* msg) { return 1; }

-

 	virtual	int       __cdecl UserIsTyping(MCONTACT hContact, int type);

 

 	virtual	int       __cdecl OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam);

diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 10ec6ed568..cac60ea904 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -336,30 +336,6 @@ int __cdecl CYahooProto::GetInfo(MCONTACT hContact, int /*infoType*/ )
 }

 

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

-// SearchByEmail - searches the contact by its e-mail

-

-HANDLE __cdecl CYahooProto::SearchByEmail( const PROTOCHAR* email )

-{

-	return 0;

-}

-

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

-// SearchByName - searches the contact by its first or last name, or by a nickname

-

-HANDLE __cdecl CYahooProto::SearchByName( const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName )

-{

-	return 0;

-}

-

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

-// RecvContacts

-

-int __cdecl CYahooProto::RecvContacts(MCONTACT/*hContact*/, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

 // RecvFile

 

 int __cdecl CYahooProto::RecvFile(MCONTACT hContact, PROTORECVFILET* evt)

@@ -370,30 +346,6 @@ int __cdecl CYahooProto::RecvFile(MCONTACT hContact, PROTORECVFILET* evt)
 }

 

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

-// RecvUrl

-

-int __cdecl CYahooProto::RecvUrl(MCONTACT/*hContact*/, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

-// SendContacts

-

-int __cdecl CYahooProto::SendContacts(MCONTACT/*hContact*/, int /*flags*/, int /*nContacts*/, MCONTACT* /*hContactsList*/)

-{

-	return 1;

-}

-

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

-// SendUrl

-

-int __cdecl CYahooProto::SendUrl(MCONTACT/*hContact*/, int /*flags*/, const char* /*url*/)

-{

-	return 1;

-}

-

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

 // SetApparentMode - sets the visibility status

 

 int __cdecl CYahooProto::SetApparentMode(MCONTACT hContact, int mode)

@@ -590,14 +542,6 @@ HANDLE __cdecl CYahooProto::GetAwayMsg(MCONTACT hContact)
 }

 

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

-// PSR_AWAYMSG

-

-int __cdecl CYahooProto::RecvAwayMsg(MCONTACT/*hContact*/, int /*statusMode*/, PROTORECVEVENT*)

-{

-	return 1;

-}

-

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

 // SetAwayMsg - sets the away status message

 

 int __cdecl CYahooProto::SetAwayMsg(int status, const PROTOCHAR* msg)

diff --git a/protocols/Yahoo/src/proto.h b/protocols/Yahoo/src/proto.h
index 207351964f..f1fa073687 100644
--- a/protocols/Yahoo/src/proto.h
+++ b/protocols/Yahoo/src/proto.h
@@ -42,26 +42,19 @@ struct CYahooProto : public PROTO<CYahooProto>
 	virtual	int       __cdecl GetInfo(MCONTACT hContact, int infoType );

 

 	virtual	HANDLE    __cdecl SearchBasic( const PROTOCHAR* id );

-	virtual	HANDLE    __cdecl SearchByEmail( const PROTOCHAR* email );

-	virtual	HANDLE    __cdecl SearchByName( const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName );

 	virtual	HWND      __cdecl SearchAdvanced( HWND owner );

 	virtual	HWND      __cdecl CreateExtendedSearchUI( HWND owner );

 

-	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);

 	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

-	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

 

-	virtual	int       __cdecl SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

 	virtual	HANDLE    __cdecl SendFile(MCONTACT hContact, const PROTOCHAR *szDescription, PROTOCHAR **ppszFiles);

 	virtual	int       __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg );

-	virtual	int       __cdecl SendUrl(MCONTACT hContact, int flags, const char* url );

 

 	virtual	int       __cdecl SetApparentMode(MCONTACT hContact, int mode);

 	virtual	int       __cdecl SetStatus(int iNewStatus);

 

 	virtual	HANDLE    __cdecl GetAwayMsg(MCONTACT hContact);

-	virtual	int       __cdecl RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT *evt);

 	virtual	int       __cdecl SetAwayMsg( int m_iStatus, const PROTOCHAR *msg);

 	virtual INT_PTR    __cdecl GetMyAwayMsg(WPARAM wParam, LPARAM lParam);

 

diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 0e3d5e0eae..043c374ea3 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -540,3 +540,71 @@ mir_wstrcmpi                  @280
 ?UnlockBuffer@?$CMSimpleStringT@_W@@QAEXXZ @538 NONAME

 ?c_str@?$CMSimpleStringT@D@@QBEPBDXZ @539 NONAME

 ?c_str@?$CMSimpleStringT@_W@@QBEPB_WXZ @540 NONAME

+??0PROTO_INTERFACE@@QAE@ABU0@@Z @541 NONAME

+??0PROTO_INTERFACE@@QAE@XZ @542 NONAME

+??4PROTO_INTERFACE@@QAEAAU0@ABU0@@Z @543 NONAME

+??_7PROTO_INTERFACE@@6B@ @544 NONAME

+?AddToList@PROTO_INTERFACE@@UAAIHPAUPROTOSEARCHRESULT@@@Z @545 NONAME

+?AddToListByEvent@PROTO_INTERFACE@@UAAIHHI@Z @546 NONAME

+?AuthDeny@PROTO_INTERFACE@@UAAHIPB_W@Z @547 NONAME

+?AuthRecv@PROTO_INTERFACE@@UAAHIPAUPROTORECVEVENT@@@Z @548 NONAME

+?AuthRequest@PROTO_INTERFACE@@UAAHIPB_W@Z @549 NONAME

+?Authorize@PROTO_INTERFACE@@UAAHI@Z @550 NONAME

+?CreateExtendedSearchUI@PROTO_INTERFACE@@UAAPAUHWND__@@PAU2@@Z @551 NONAME

+?FileAllow@PROTO_INTERFACE@@UAAPAXIPAXPB_W@Z @552 NONAME

+?FileCancel@PROTO_INTERFACE@@UAAHIPAX@Z @553 NONAME

+?FileDeny@PROTO_INTERFACE@@UAAHIPAXPB_W@Z @554 NONAME

+?FileResume@PROTO_INTERFACE@@UAAHPAXPAHPAPB_W@Z @555 NONAME

+?GetAwayMsg@PROTO_INTERFACE@@UAAPAXI@Z @556 NONAME

+?GetCaps@PROTO_INTERFACE@@UAAKHI@Z @557 NONAME

+?GetInfo@PROTO_INTERFACE@@UAAHIH@Z @558 NONAME

+?OnEvent@PROTO_INTERFACE@@UAAHW4PROTOEVENTTYPE@@IJ@Z @559 NONAME

+?ProtoBroadcastAck@PROTO_INTERFACE@@QAEHIHHPAXJ@Z @560 NONAME

+?RecvAwayMsg@PROTO_INTERFACE@@UAAHIHPAUPROTORECVEVENT@@@Z @561 NONAME

+?RecvContacts@PROTO_INTERFACE@@UAAHIPAUPROTORECVEVENT@@@Z @562 NONAME

+?RecvFile@PROTO_INTERFACE@@UAAHIPAUPROTORECVFILET@@@Z @563 NONAME

+?RecvMsg@PROTO_INTERFACE@@UAAHIPAUPROTORECVEVENT@@@Z @564 NONAME

+?RecvUrl@PROTO_INTERFACE@@UAAHIPAUPROTORECVEVENT@@@Z @565 NONAME

+?SearchAdvanced@PROTO_INTERFACE@@UAAPAUHWND__@@PAU2@@Z @566 NONAME

+?SearchBasic@PROTO_INTERFACE@@UAAPAXPB_W@Z @567 NONAME

+?SearchByEmail@PROTO_INTERFACE@@UAAPAXPB_W@Z @568 NONAME

+?SearchByName@PROTO_INTERFACE@@UAAPAXPB_W00@Z @569 NONAME

+?SendContacts@PROTO_INTERFACE@@UAAHIHHPAI@Z @570 NONAME

+?SendFile@PROTO_INTERFACE@@UAAPAXIPB_WPAPA_W@Z @571 NONAME

+?SendMsg@PROTO_INTERFACE@@UAAHIHPBD@Z @572 NONAME

+?SendUrl@PROTO_INTERFACE@@UAAHIHPBD@Z @573 NONAME

+?SetApparentMode@PROTO_INTERFACE@@UAAHIH@Z @574 NONAME

+?SetAwayMsg@PROTO_INTERFACE@@UAAHHPB_W@Z @575 NONAME

+?SetStatus@PROTO_INTERFACE@@UAAHH@Z @576 NONAME

+?UserIsTyping@PROTO_INTERFACE@@UAAHIH@Z @577 NONAME

+?debugLogA@PROTO_INTERFACE@@QAAXPBDZZ @578 NONAME

+?debugLogW@PROTO_INTERFACE@@QAAXPB_WZZ @579 NONAME

+?delSetting@PROTO_INTERFACE@@QAEHIPBD@Z @580 NONAME

+?delSetting@PROTO_INTERFACE@@QAEHPBD@Z @581 NONAME

+?getBool@PROTO_INTERFACE@@QAE_NIPBD_N@Z @582 NONAME

+?getBool@PROTO_INTERFACE@@QAE_NPBD_N@Z @583 NONAME

+?getByte@PROTO_INTERFACE@@QAEHIPBDE@Z @584 NONAME

+?getByte@PROTO_INTERFACE@@QAEHPBDE@Z @585 NONAME

+?getDword@PROTO_INTERFACE@@QAEKIPBDK@Z @586 NONAME

+?getDword@PROTO_INTERFACE@@QAEKPBDK@Z @587 NONAME

+?getString@PROTO_INTERFACE@@QAEHIPBDPAUDBVARIANT@@@Z @588 NONAME

+?getString@PROTO_INTERFACE@@QAEHPBDPAUDBVARIANT@@@Z @589 NONAME

+?getStringA@PROTO_INTERFACE@@QAEPADIPBD@Z @590 NONAME

+?getStringA@PROTO_INTERFACE@@QAEPADPBD@Z @591 NONAME

+?getWString@PROTO_INTERFACE@@QAEHIPBDPAUDBVARIANT@@@Z @592 NONAME

+?getWString@PROTO_INTERFACE@@QAEHPBDPAUDBVARIANT@@@Z @593 NONAME

+?getWStringA@PROTO_INTERFACE@@QAEPA_WIPBD@Z @594 NONAME

+?getWStringA@PROTO_INTERFACE@@QAEPA_WPBD@Z @595 NONAME

+?getWord@PROTO_INTERFACE@@QAEHIPBDG@Z @596 NONAME

+?getWord@PROTO_INTERFACE@@QAEHPBDG@Z @597 NONAME

+?isChatRoom@PROTO_INTERFACE@@QAE_NI@Z @598 NONAME

+?setByte@PROTO_INTERFACE@@QAEXIPBDE@Z @599 NONAME

+?setByte@PROTO_INTERFACE@@QAEXPBDE@Z @600 NONAME

+?setDword@PROTO_INTERFACE@@QAEXIPBDK@Z @601 NONAME

+?setDword@PROTO_INTERFACE@@QAEXPBDK@Z @602 NONAME

+?setString@PROTO_INTERFACE@@QAEXIPBD0@Z @603 NONAME

+?setString@PROTO_INTERFACE@@QAEXPBD0@Z @604 NONAME

+?setWString@PROTO_INTERFACE@@QAEXIPBDPB_W@Z @605 NONAME

+?setWString@PROTO_INTERFACE@@QAEXPBDPB_W@Z @606 NONAME

+?setWord@PROTO_INTERFACE@@QAEXIPBDG@Z @607 NONAME

+?setWord@PROTO_INTERFACE@@QAEXPBDG@Z @608 NONAME

diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 1303583f1e..b66aa36d74 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -540,3 +540,71 @@ mir_wstrcmpi                  @280
 ?UnlockBuffer@?$CMSimpleStringT@_W@@QEAAXXZ @538 NONAME

 ?c_str@?$CMSimpleStringT@D@@QEBAPEBDXZ @539 NONAME

 ?c_str@?$CMSimpleStringT@_W@@QEBAPEB_WXZ @540 NONAME

+??0PROTO_INTERFACE@@QEAA@AEBU0@@Z @541 NONAME

+??0PROTO_INTERFACE@@QEAA@XZ @542 NONAME

+??4PROTO_INTERFACE@@QEAAAEAU0@AEBU0@@Z @543 NONAME

+??_7PROTO_INTERFACE@@6B@ @544 NONAME

+?AddToList@PROTO_INTERFACE@@UEAAIHPEAUPROTOSEARCHRESULT@@@Z @545 NONAME

+?AddToListByEvent@PROTO_INTERFACE@@UEAAIHHI@Z @546 NONAME

+?AuthDeny@PROTO_INTERFACE@@UEAAHIPEB_W@Z @547 NONAME

+?AuthRecv@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVEVENT@@@Z @548 NONAME

+?AuthRequest@PROTO_INTERFACE@@UEAAHIPEB_W@Z @549 NONAME

+?Authorize@PROTO_INTERFACE@@UEAAHI@Z @550 NONAME

+?CreateExtendedSearchUI@PROTO_INTERFACE@@UEAAPEAUHWND__@@PEAU2@@Z @551 NONAME

+?FileAllow@PROTO_INTERFACE@@UEAAPEAXIPEAXPEB_W@Z @552 NONAME

+?FileCancel@PROTO_INTERFACE@@UEAAHIPEAX@Z @553 NONAME

+?FileDeny@PROTO_INTERFACE@@UEAAHIPEAXPEB_W@Z @554 NONAME

+?FileResume@PROTO_INTERFACE@@UEAAHPEAXPEAHPEAPEB_W@Z @555 NONAME

+?GetAwayMsg@PROTO_INTERFACE@@UEAAPEAXI@Z @556 NONAME

+?GetCaps@PROTO_INTERFACE@@UEAA_KHI@Z @557 NONAME

+?GetInfo@PROTO_INTERFACE@@UEAAHIH@Z @558 NONAME

+?OnEvent@PROTO_INTERFACE@@UEAAHW4PROTOEVENTTYPE@@_K_J@Z @559 NONAME

+?ProtoBroadcastAck@PROTO_INTERFACE@@QEAA_JIHHPEAX_J@Z @560 NONAME

+?RecvAwayMsg@PROTO_INTERFACE@@UEAAHIHPEAUPROTORECVEVENT@@@Z @561 NONAME

+?RecvContacts@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVEVENT@@@Z @562 NONAME

+?RecvFile@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVFILET@@@Z @563 NONAME

+?RecvMsg@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVEVENT@@@Z @564 NONAME

+?RecvUrl@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVEVENT@@@Z @565 NONAME

+?SearchAdvanced@PROTO_INTERFACE@@UEAAPEAUHWND__@@PEAU2@@Z @566 NONAME

+?SearchBasic@PROTO_INTERFACE@@UEAAPEAXPEB_W@Z @567 NONAME

+?SearchByEmail@PROTO_INTERFACE@@UEAAPEAXPEB_W@Z @568 NONAME

+?SearchByName@PROTO_INTERFACE@@UEAAPEAXPEB_W00@Z @569 NONAME

+?SendContacts@PROTO_INTERFACE@@UEAAHIHHPEAI@Z @570 NONAME

+?SendFile@PROTO_INTERFACE@@UEAAPEAXIPEB_WPEAPEA_W@Z @571 NONAME

+?SendMsg@PROTO_INTERFACE@@UEAAHIHPEBD@Z @572 NONAME

+?SendUrl@PROTO_INTERFACE@@UEAAHIHPEBD@Z @573 NONAME

+?SetApparentMode@PROTO_INTERFACE@@UEAAHIH@Z @574 NONAME

+?SetAwayMsg@PROTO_INTERFACE@@UEAAHHPEB_W@Z @575 NONAME

+?SetStatus@PROTO_INTERFACE@@UEAAHH@Z @576 NONAME

+?UserIsTyping@PROTO_INTERFACE@@UEAAHIH@Z @577 NONAME

+?debugLogA@PROTO_INTERFACE@@QEAAXPEBDZZ @578 NONAME

+?debugLogW@PROTO_INTERFACE@@QEAAXPEB_WZZ @579 NONAME

+?delSetting@PROTO_INTERFACE@@QEAA_JIPEBD@Z @580 NONAME

+?delSetting@PROTO_INTERFACE@@QEAA_JPEBD@Z @581 NONAME

+?getBool@PROTO_INTERFACE@@QEAA_NIPEBD_N@Z @582 NONAME

+?getBool@PROTO_INTERFACE@@QEAA_NPEBD_N@Z @583 NONAME

+?getByte@PROTO_INTERFACE@@QEAAHIPEBDE@Z @584 NONAME

+?getByte@PROTO_INTERFACE@@QEAAHPEBDE@Z @585 NONAME

+?getDword@PROTO_INTERFACE@@QEAAKIPEBDK@Z @586 NONAME

+?getDword@PROTO_INTERFACE@@QEAAKPEBDK@Z @587 NONAME

+?getString@PROTO_INTERFACE@@QEAA_JIPEBDPEAUDBVARIANT@@@Z @588 NONAME

+?getString@PROTO_INTERFACE@@QEAA_JPEBDPEAUDBVARIANT@@@Z @589 NONAME

+?getStringA@PROTO_INTERFACE@@QEAAPEADIPEBD@Z @590 NONAME

+?getStringA@PROTO_INTERFACE@@QEAAPEADPEBD@Z @591 NONAME

+?getWString@PROTO_INTERFACE@@QEAA_JIPEBDPEAUDBVARIANT@@@Z @592 NONAME

+?getWString@PROTO_INTERFACE@@QEAA_JPEBDPEAUDBVARIANT@@@Z @593 NONAME

+?getWStringA@PROTO_INTERFACE@@QEAAPEA_WIPEBD@Z @594 NONAME

+?getWStringA@PROTO_INTERFACE@@QEAAPEA_WPEBD@Z @595 NONAME

+?getWord@PROTO_INTERFACE@@QEAAHIPEBDG@Z @596 NONAME

+?getWord@PROTO_INTERFACE@@QEAAHPEBDG@Z @597 NONAME

+?isChatRoom@PROTO_INTERFACE@@QEAA_NI@Z @598 NONAME

+?setByte@PROTO_INTERFACE@@QEAAXIPEBDE@Z @599 NONAME

+?setByte@PROTO_INTERFACE@@QEAAXPEBDE@Z @600 NONAME

+?setDword@PROTO_INTERFACE@@QEAAXIPEBDK@Z @601 NONAME

+?setDword@PROTO_INTERFACE@@QEAAXPEBDK@Z @602 NONAME

+?setString@PROTO_INTERFACE@@QEAAXIPEBD0@Z @603 NONAME

+?setString@PROTO_INTERFACE@@QEAAXPEBD0@Z @604 NONAME

+?setWString@PROTO_INTERFACE@@QEAAXIPEBDPEB_W@Z @605 NONAME

+?setWString@PROTO_INTERFACE@@QEAAXPEBDPEB_W@Z @606 NONAME

+?setWord@PROTO_INTERFACE@@QEAAXIPEBDG@Z @607 NONAME

+?setWord@PROTO_INTERFACE@@QEAAXPEBDG@Z @608 NONAME

diff --git a/src/mir_core/src/protos.cpp b/src/mir_core/src/protos.cpp
index e187c9d251..6ac870da74 100644
--- a/src/mir_core/src/protos.cpp
+++ b/src/mir_core/src/protos.cpp
@@ -262,3 +262,167 @@ MIR_CORE_DLL(int) ProtoGetAvatarFileFormat(const TCHAR *ptszFileName)
 

 	return (res && dwBytes == SIZEOF(buf)) ? ProtoGetBufferFormat(buf) : PA_FORMAT_UNKNOWN;

 }

+

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

+// default PROTO_INTERFACE method implementations

+

+MCONTACT PROTO_INTERFACE::AddToList(int flags, PROTOSEARCHRESULT* psr)

+{

+	return NULL; // error

+}

+

+MCONTACT PROTO_INTERFACE::AddToListByEvent(int flags, int iContact, MEVENT hDbEvent)

+{

+	return NULL; // error

+}

+

+int PROTO_INTERFACE::Authorize(MEVENT hDbEvent)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::AuthRecv(MCONTACT hContact, PROTORECVEVENT*)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage)

+{

+	return 1; // error

+}

+

+HANDLE PROTO_INTERFACE::FileAllow(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szPath)

+{

+	return NULL; // error

+}

+

+int PROTO_INTERFACE::FileCancel(MCONTACT hContact, HANDLE hTransfer)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::FileDeny(MCONTACT hContact, HANDLE hTransfer, const PROTOCHAR* szReason)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::FileResume(HANDLE hTransfer, int* action, const PROTOCHAR** szFilename)

+{

+	return 1; // error

+}

+

+DWORD_PTR PROTO_INTERFACE::GetCaps(int type, MCONTACT hContact)

+{

+	return 0; // empty value

+}

+

+int PROTO_INTERFACE::GetInfo(MCONTACT hContact, int infoType)

+{

+	return 1; // error

+}

+

+HANDLE PROTO_INTERFACE::SearchBasic(const PROTOCHAR* id)

+{

+	return NULL; // error

+}

+

+HANDLE PROTO_INTERFACE::SearchByEmail(const PROTOCHAR* email)

+{

+	return NULL; // error

+}

+

+HANDLE PROTO_INTERFACE::SearchByName(const PROTOCHAR* nick, const PROTOCHAR* firstName, const PROTOCHAR* lastName)

+{

+	return NULL; // error

+}

+

+HWND PROTO_INTERFACE::SearchAdvanced(HWND owner)

+{

+	return NULL; // error

+}

+

+HWND PROTO_INTERFACE::CreateExtendedSearchUI(HWND owner)

+{

+	return NULL; // error

+}

+

+int PROTO_INTERFACE::RecvContacts(MCONTACT hContact, PROTORECVEVENT*)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::RecvFile(MCONTACT hContact, PROTOFILEEVENT *evt)

+{

+	return ::Proto_RecvFile(hContact, evt); // default file receiver

+}

+

+int PROTO_INTERFACE::RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt)

+{

+	::Proto_RecvMessage(hContact, evt); // default message receiver

+	return 0;

+}

+

+int PROTO_INTERFACE::RecvUrl(MCONTACT hContact, PROTORECVEVENT*)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList)

+{

+	return 1; // error

+}

+

+HANDLE PROTO_INTERFACE::SendFile(MCONTACT hContact, const PROTOCHAR *szDescription, PROTOCHAR **ppszFiles)

+{

+	return NULL; // error

+}

+

+int PROTO_INTERFACE::SendMsg(MCONTACT hContact, int flags, const char *msg)

+{

+	return 0; // error

+}

+

+int PROTO_INTERFACE::SendUrl(MCONTACT hContact, int flags, const char *url)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::SetApparentMode(MCONTACT hContact, int mode)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::SetStatus(int iNewStatus)

+{

+	return 1; // you better declare it

+}

+

+HANDLE PROTO_INTERFACE::GetAwayMsg(MCONTACT hContact)

+{

+	return NULL; // no away message

+}

+

+int PROTO_INTERFACE::RecvAwayMsg(MCONTACT hContact, int mode, PROTORECVEVENT* evt)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::SetAwayMsg(int iStatus, const PROTOCHAR* msg)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::UserIsTyping(MCONTACT hContact, int type)

+{

+	return 1; // error

+}

+

+int PROTO_INTERFACE::OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam)

+{

+	return 1; // not an error, vitally important

+}