PROTO<>::SendAwayMsg / PSS_AWAYMSG considered unused

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

31 files changed, 0 insertions, 122 deletions

diff --git a/include/m_protoint.h b/include/m_protoint.h
index 69aa6339b4..769b4ff027 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -172,7 +172,6 @@ struct  PROTO_INTERFACE : public MZeroedObject
 

 	virtual	HANDLE    __cdecl GetAwayMsg(HANDLE hContact) = 0;

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

-	virtual	int       __cdecl SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char* msg) = 0;

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

 

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

diff --git a/include/m_protosvc.h b/include/m_protosvc.h
index 304d9e4f9f..8d27a0e859 100644
--- a/include/m_protosvc.h
+++ b/include/m_protosvc.h
@@ -250,8 +250,6 @@ will pick this up and everything will be good.
 //Returns 0 on success, nonzero on failure

 //Note that this service will not be available unless PF1_MODEMSGSEND is set

 //and PF1_INDIVMODEMSG is *not* set.

-//If PF1_INDIVMODEMSG is set, then see PSS_AWAYMSG for details of

-//the operation of away messages

 //Protocol modules must support szMessage = NULL. It may either mean to use an

 //empty message, or (preferably) to not reply at all to any requests

 #define PS_SETAWAYMSG   "/SetAwayMsg"

@@ -617,17 +615,6 @@ typedef struct {
 //type = ACKTYPE_AWAYMSG, result = success/failure, lParam = (const char*)szMessage

 #define PSS_GETAWAYMSG    "/GetAwayMsg"

 

-//Sends an away message reply to a user

-//wParam = (WPARAM)(HANDLE)hProcess (of ack)

-//lParam = (LPARAM)(const char*)szMessage

-//Returns 0 on success, nonzero on failure

-//This function must only be used if the protocol has PF1_MODEMSGSEND and

-//PF1_INDIVMODEMSG set. Otherwise, PS_SETAWAYMESSAGE should be used.

-//This function must only be called in response to an ack that a user has

-//requested our away message. The ack is sent as:

-//type = ACKTYPE_AWAYMSG, result = ACKRESULT_SENTREQUEST, lParam = 0

-#define PSS_AWAYMSG     "/SendAwayMsg"

-

 //Allows a file transfer to begin

 //wParam = (WPARAM)(HANDLE)hTransfer

 //lParam = (LPARAM)(const TCHAR*)szPath

diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp
index e8148a83c2..bdc2568b7b 100644
--- a/protocols/AimOscar/src/proto.cpp
+++ b/protocols/AimOscar/src/proto.cpp
@@ -756,14 +756,6 @@ int __cdecl CAimProto::RecvAwayMsg(HANDLE hContact, int statusMode, PROTORECVEVE
 }

 

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

-// PSS_AWAYMSG

-

-int __cdecl CAimProto::SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char* msg)

-{

-	return 1;

-}

-

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

 // SetAwayMsg - sets the away m_iStatus message

 

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

diff --git a/protocols/AimOscar/src/proto.h b/protocols/AimOscar/src/proto.h
index c829c64ec8..9900ff937b 100644
--- a/protocols/AimOscar/src/proto.h
+++ b/protocols/AimOscar/src/proto.h
@@ -67,7 +67,6 @@ struct CAimProto : public PROTO<CAimProto>
 

 	virtual	HANDLE __cdecl GetAwayMsg( HANDLE hContact );

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

-	virtual	int    __cdecl SendAwayMsg( HANDLE hContact, HANDLE hProcess, const char* msg );

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

 

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

diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp
index c899fd4121..11367d265a 100644
--- a/protocols/EmLanProto/src/mlan.cpp
+++ b/protocols/EmLanProto/src/mlan.cpp
@@ -505,21 +505,6 @@ int CMLan::GetAwayMsg(CCSDATA* ccs)
 	return cid;

 }

 

-//int CMLan::SendAwayMsg(CCSDATA* ccs)

-//{

-//	if (ccs->lParam)

-//	{

-//		TPacket pak;

-//		ZeroMemory(&pak, sizeof(pak));

-//

-//		pak.idAckAwayMessage = ccs->wParam;

-//		pak.strAwayMessage = (char*)ccs->lParam;

-//		u_long addr = db_get_dw(ccs->hContact, PROTONAME, "ipaddr", 0);

-//		SendPacketExt(pak, addr);

-//	}

-//	return 0;

-//}

-

 int CMLan::RecvAwayMsg(CCSDATA* ccs)

 {

 	PROTORECVEVENT *pre=(PROTORECVEVENT*)ccs->lParam;

diff --git a/protocols/FacebookRM/src/proto.h b/protocols/FacebookRM/src/proto.h
index 40c03e6450..7f90c9fa44 100644
--- a/protocols/FacebookRM/src/proto.h
+++ b/protocols/FacebookRM/src/proto.h
@@ -91,7 +91,6 @@ public:
 

 	virtual	HANDLE    __cdecl GetAwayMsg(HANDLE hContact);

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

-	virtual	int       __cdecl SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char* msg);

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

 

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

diff --git a/protocols/FacebookRM/src/stubs.cpp b/protocols/FacebookRM/src/stubs.cpp
index f7b0353b45..1689b89f3f 100644
--- a/protocols/FacebookRM/src/stubs.cpp
+++ b/protocols/FacebookRM/src/stubs.cpp
@@ -113,8 +113,3 @@ int FacebookProto::RecvAwayMsg(HANDLE hContact,int mode,PROTORECVEVENT *evt)
 {

 	return 1;

 }

-

-int FacebookProto::SendAwayMsg(HANDLE hContact,HANDLE hProcess,const char *msg)

-{

-	return 1;

-}

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index f87c8451c5..991b30ee5f 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -140,7 +140,6 @@ int    GGPROTO::RecvUrl(HANDLE hContact, PROTORECVEVENT *pre) { return 1; }
 int    GGPROTO::SendContacts(HANDLE hContact, int flags, int nContacts, HANDLE *hContactsList) { return 1; }

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

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

-int    GGPROTO::SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char *msg) { return 1; }

 

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

 // when contact is added to list

diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h
index e6389f7266..f10435168d 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.h
+++ b/protocols/Gadu-Gadu/src/gg_proto.h
@@ -70,7 +70,6 @@ struct GGPROTO : public PROTO<GGPROTO>
 

 	virtual	HANDLE __cdecl GetAwayMsg( HANDLE hContact );

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

-	virtual	int    __cdecl SendAwayMsg( HANDLE hContact, HANDLE hProcess, const char* msg );

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

 

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

diff --git a/protocols/IRCG/src/irc.h b/protocols/IRCG/src/irc.h
index 3be89ed142..510375eee8 100644
--- a/protocols/IRCG/src/irc.h
+++ b/protocols/IRCG/src/irc.h
@@ -253,7 +253,6 @@ struct CIrcProto : public PROTO<CIrcProto>
 

 	virtual	HANDLE __cdecl GetAwayMsg( HANDLE hContact );

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

-	virtual	int    __cdecl SendAwayMsg( HANDLE hContact, HANDLE hProcess, const char* msg );

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

 

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

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index 6ee3d0a825..0592354d3a 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -982,14 +982,6 @@ int __cdecl CIrcProto::RecvAwayMsg( HANDLE, int, PROTORECVEVENT* )
 }

 

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

-// PSS_AWAYMSG

-

-int __cdecl CIrcProto::SendAwayMsg( HANDLE, HANDLE, const char* )

-{

-	return 1;

-}

-

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

 // SetAwayMsg - sets the away status message

 

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

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index d8fc2ebb3b..7a283eff23 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -2135,15 +2135,6 @@ int __cdecl CIcqProto::RecvAwayMsg( HANDLE hContact, int statusMode, PROTORECVEV
 

 

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

-// PSS_AWAYMSG - send status mode message (individual mode)

-

-int __cdecl CIcqProto::SendAwayMsg( HANDLE hContact, HANDLE hProcess, const char* msg )

-{

-	return 1;

-}

-

-

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

 // PS_SetAwayMsg - sets the away status message

 

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

diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index 98dfb90c1c..31f6047af3 100644
--- a/protocols/IcqOscarJ/src/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
@@ -93,7 +93,6 @@ struct CIcqProto : public PROTO<CIcqProto>
 

 	virtual	HANDLE __cdecl GetAwayMsg( HANDLE hContact );

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

-	virtual	int    __cdecl SendAwayMsg( HANDLE hContact, HANDLE hProcess, const char* msg );

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

 

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

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 08bbb6cba5..289a045178 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -1351,14 +1351,6 @@ int __cdecl CJabberProto::RecvAwayMsg(HANDLE /*hContact*/, int /*statusMode*/, P
 }

 

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

-// PSS_AWAYMSG

-

-int __cdecl CJabberProto::SendAwayMsg(HANDLE /*hContact*/, HANDLE /*hProcess*/, const char*)

-{

-	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 00b8ca6fe5..d09f3bf6aa 100644
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -191,7 +191,6 @@ struct CJabberProto : public PROTO<CJabberProto>
 

 	virtual	HANDLE __cdecl GetAwayMsg(HANDLE hContact);

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

-	virtual	int    __cdecl SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char* msg);

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

 

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

diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index 3988618950..462c35dbb9 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -206,7 +206,6 @@ HANDLE CMraProto::ChangeInfo(int, void*) { return NULL; }
 int    CMraProto::FileResume(HANDLE, int*, const TCHAR**) { return 1; }

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

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

-int    CMraProto::SendAwayMsg(HANDLE, HANDLE, const char* ) { return 1; }

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

 

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

diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h
index 990ea86a46..c6f9b779e6 100644
--- a/protocols/MRA/src/MraProto.h
+++ b/protocols/MRA/src/MraProto.h
@@ -77,7 +77,6 @@ struct CMraProto : public PROTO<CMraProto>
 

 	virtual	HANDLE __cdecl GetAwayMsg(HANDLE hContact);

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

-	virtual	int    __cdecl SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char* msg);

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

 

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

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index 6ea0c131b7..6648e538c5 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -1009,14 +1009,6 @@ int __cdecl CMsnProto::RecvAwayMsg(HANDLE hContact, int statusMode, PROTORECVEVE
 	return 1;

 }

 

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

-// PSS_AWAYMSG

-

-int __cdecl CMsnProto::SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char* msg)

-{

-	return 1;

-}

-

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

 // MsnSetStatus - set the plugin's connection status

 

diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h
index b5bd1e8173..03daa11483 100644
--- a/protocols/MSN/src/msn_proto.h
+++ b/protocols/MSN/src/msn_proto.h
@@ -71,7 +71,6 @@ struct CMsnProto : public PROTO<CMsnProto>
 

 	virtual	HANDLE    __cdecl GetAwayMsg(HANDLE hContact);

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

-	virtual	int       __cdecl SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char* msg);

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

 

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

diff --git a/protocols/Omegle/src/proto.h b/protocols/Omegle/src/proto.h
index 0d37301648..85b91bbcb8 100644
--- a/protocols/Omegle/src/proto.h
+++ b/protocols/Omegle/src/proto.h
@@ -83,7 +83,6 @@ public:
 

 	virtual	HANDLE    __cdecl GetAwayMsg( HANDLE hContact );

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

-	virtual	int       __cdecl SendAwayMsg( HANDLE hContact, HANDLE hProcess, const char* msg );

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

 

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

diff --git a/protocols/Omegle/src/stubs.cpp b/protocols/Omegle/src/stubs.cpp
index 9d30932504..1bad2bfca9 100644
--- a/protocols/Omegle/src/stubs.cpp
+++ b/protocols/Omegle/src/stubs.cpp
@@ -147,11 +147,6 @@ int OmegleProto::RecvAwayMsg(HANDLE hContact,int mode,PROTORECVEVENT *evt)
 	return 1;

 }

 

-int OmegleProto::SendAwayMsg(HANDLE hContact,HANDLE hProcess,const char *msg)

-{

-	return 1;

-}

-

 int OmegleProto::UserIsTyping(HANDLE hContact, int type)

 {

 	return 1;

diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp
index 8d0017d2a3..a5518085e5 100644
--- a/protocols/Skype/src/skype_proto.cpp
+++ b/protocols/Skype/src/skype_proto.cpp
@@ -617,7 +617,6 @@ int CSkypeProto::SetStatus(int new_status)
 

 HANDLE __cdecl CSkypeProto::GetAwayMsg(HANDLE hContact) { return 0; }

 int    __cdecl CSkypeProto::RecvAwayMsg(HANDLE hContact, int mode, PROTORECVEVENT *evt) { return 0; }

-int    __cdecl CSkypeProto::SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char *msg) { return 0; }

 int    __cdecl CSkypeProto::SetAwayMsg(int m_iStatus, const TCHAR *msg) { return 0; }

 

 int __cdecl CSkypeProto::UserIsTyping(HANDLE hContact, int type)

diff --git a/protocols/Skype/src/skype_proto.h b/protocols/Skype/src/skype_proto.h
index 0ba3a953fa..2b5f7998b2 100644
--- a/protocols/Skype/src/skype_proto.h
+++ b/protocols/Skype/src/skype_proto.h
@@ -218,7 +218,6 @@ public:
 

 	virtual	HANDLE __cdecl GetAwayMsg( HANDLE hContact );

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

-	virtual	int    __cdecl SendAwayMsg( HANDLE hContact, HANDLE hProcess, const char* msg );

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

 

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

diff --git a/protocols/Tlen/src/tlen.h b/protocols/Tlen/src/tlen.h
index c6b4b64845..5fbedc645a 100644
--- a/protocols/Tlen/src/tlen.h
+++ b/protocols/Tlen/src/tlen.h
@@ -257,7 +257,6 @@ struct TlenProtocol : public PROTO<TlenProtocol>
 

 	virtual	HANDLE    __cdecl GetAwayMsg(HANDLE hContact);

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

-	virtual	int       __cdecl SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char* msg);

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

 

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

diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp
index 558358bb2e..acfa66bc9b 100644
--- a/protocols/Tlen/src/tlen_svc.cpp
+++ b/protocols/Tlen/src/tlen_svc.cpp
@@ -714,11 +714,6 @@ int TlenProtocol::RecvAwayMsg(HANDLE hContact, int mode, PROTORECVEVENT* evt)
 	return 0;

 }

 

-int TlenProtocol::SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char* msg)

-{

-	return 0;

-}

-

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

 {

 	TLEN_FILE_TRANSFER *ft;

diff --git a/protocols/Twitter/src/proto.h b/protocols/Twitter/src/proto.h
index ca97987c0c..1bae62f510 100644
--- a/protocols/Twitter/src/proto.h
+++ b/protocols/Twitter/src/proto.h
@@ -75,7 +75,6 @@ public:
 

 	virtual	HANDLE    __cdecl GetAwayMsg(HANDLE);

 	virtual	int       __cdecl RecvAwayMsg(HANDLE,int,PROTORECVEVENT *);

-	virtual	int       __cdecl SendAwayMsg(HANDLE,HANDLE,const char *);

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

 

 	virtual	int       __cdecl UserIsTyping(HANDLE,int);

diff --git a/protocols/Twitter/src/stubs.cpp b/protocols/Twitter/src/stubs.cpp
index 472138abe3..da781eda1a 100644
--- a/protocols/Twitter/src/stubs.cpp
+++ b/protocols/Twitter/src/stubs.cpp
@@ -123,11 +123,6 @@ int TwitterProto::RecvAwayMsg(HANDLE hContact,int mode,PROTORECVEVENT *evt)
 	return 1;

 }

 

-int TwitterProto::SendAwayMsg(HANDLE hContact,HANDLE hProcess,const char *msg)

-{

-	return 1;

-}

-

 int TwitterProto::SetAwayMsg(int status,const TCHAR *msg)

 {

 	return 1;

diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 72c454639f..4bf27e2cbf 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -604,14 +604,6 @@ int __cdecl CYahooProto::RecvAwayMsg( HANDLE /*hContact*/, int /*statusMode*/, P
 }

 

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

-// PSS_AWAYMSG

-

-int __cdecl CYahooProto::SendAwayMsg( HANDLE /*hContact*/, HANDLE /*hProcess*/, const char* )

-{

-	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 468165d1bd..ea358abdbd 100644
--- a/protocols/Yahoo/src/proto.h
+++ b/protocols/Yahoo/src/proto.h
@@ -64,7 +64,6 @@ struct CYahooProto : public PROTO<CYahooProto>
 

 	virtual	HANDLE __cdecl GetAwayMsg( HANDLE hContact );

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

-	virtual	int    __cdecl SendAwayMsg( HANDLE hContact, HANDLE hProcess, const char* msg );

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

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

 

diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp
index 23cda5cc42..4a61f457fe 100644
--- a/src/modules/protocols/protocols.cpp
+++ b/src/modules/protocols/protocols.cpp
@@ -486,7 +486,6 @@ INT_PTR CallProtoServiceInt(HANDLE hContact, const char *szModule, const char *s
 			case 29: return (INT_PTR)ppi->SetStatus(wParam);

 			case 30: return (INT_PTR)ppi->GetAwayMsg(hContact);

 			case 31: return (INT_PTR)ppi->RecvAwayMsg(hContact, wParam, (PROTORECVEVENT*)lParam);

-			case 32: return (INT_PTR)ppi->SendAwayMsg(hContact, (HANDLE)wParam, (const char*)lParam);

 			case 33:

 				if (ppi->m_iVersion > 1)

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

@@ -678,7 +677,6 @@ int LoadProtocolsModule(void)
 	InsertServiceListItem(29, PS_SETSTATUS);

 	InsertServiceListItem(30, PSS_GETAWAYMSG);

 	InsertServiceListItem(31, PSR_AWAYMSG);

-	InsertServiceListItem(32, PSS_AWAYMSG);

 	InsertServiceListItem(33, PS_SETAWAYMSG);

 	InsertServiceListItem(34, PSS_USERISTYPING);

 	InsertServiceListItem(35, PS_GETNAME);

diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp
index 83c9d1dac5..abe590f541 100644
--- a/src/modules/protocols/protoint.cpp
+++ b/src/modules/protocols/protoint.cpp
@@ -252,12 +252,6 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE
 		return (int)ProtoCallService(m_szModuleName, PSR_AWAYMSG, 0, (LPARAM)&ccs);

 	}

 

-	int __cdecl SendAwayMsg(HANDLE hContact, HANDLE hProcess, const char* msg)

-	{

-		CCSDATA ccs = { hContact, PSS_AWAYMSG, (WPARAM)hProcess, (LPARAM)msg };

-		return (int)ProtoCallService(m_szModuleName, PSS_AWAYMSG, 0, (LPARAM)&ccs);

-	}

-

 	int __cdecl SetAwayMsg(int iStatus, const TCHAR* msg)

 	{

 		return (int)ProtoCallService(m_szModuleName, PS_SETAWAYMSG, iStatus, (LPARAM)StrConvA(msg));