no need to call PSS_GETINFO, PSS_GETAWAYMSG, PSS_FILEALLOW, PSS_FILEDENY & PSS_FILECANCEL via Proto_ChainSend with all those filters etc, the simple call of CallContactService is enough

7 files changed, 13 insertions, 23 deletions

diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp
index 215f02a24b..30f0bc886c 100644
--- a/protocols/EmLanProto/src/amdproto.cpp
+++ b/protocols/EmLanProto/src/amdproto.cpp
@@ -334,13 +334,13 @@ int CMPlugin::Load()
 	CreateProtoServiceFunction(MODULENAME, PS_ADDTOLIST, EMPAddToList);

 	CreateProtoServiceFunction(MODULENAME, PSS_MESSAGE, EMPSendMessage);

 	CreateProtoServiceFunction(MODULENAME, PSR_MESSAGE, EMPRecvMessage);

-	CreateProtoServiceFunction(MODULENAME, PSS_GETAWAYMSG, EMPGetAwayMsg);

+	CreateProtoServiceFunction(MODULENAME, PS_GETAWAYMSG, EMPGetAwayMsg);

 	CreateProtoServiceFunction(MODULENAME, PS_SETAWAYMSG, EMPSetAwayMsg);

 	CreateProtoServiceFunction(MODULENAME, PSR_AWAYMSG, EMPRecvAwayMessage);

 	CreateProtoServiceFunction(MODULENAME, PS_FILERESUME, EMPFileResume);

-	CreateProtoServiceFunction(MODULENAME, PSS_FILEALLOW, EMPSendFileAllow);

-	CreateProtoServiceFunction(MODULENAME, PSS_FILEDENY, EMPSendFileDeny);

-	CreateProtoServiceFunction(MODULENAME, PSS_FILECANCEL, EMPSendFileCancel);

+	CreateProtoServiceFunction(MODULENAME, PS_FILEALLOW, EMPSendFileAllow);

+	CreateProtoServiceFunction(MODULENAME, PS_FILEDENY, EMPSendFileDeny);

+	CreateProtoServiceFunction(MODULENAME, PS_FILECANCEL, EMPSendFileCancel);

 	CreateProtoServiceFunction(MODULENAME, PSS_FILE, EMPSendFile);

 	CreateProtoServiceFunction(MODULENAME, PSR_FILE, EMPRecvFile);

 

diff --git a/protocols/ICQCorp/src/services.cpp b/protocols/ICQCorp/src/services.cpp
index 90a79b090f..1457488d93 100644
--- a/protocols/ICQCorp/src/services.cpp
+++ b/protocols/ICQCorp/src/services.cpp
@@ -434,13 +434,13 @@ int LoadServices()
 	CreateProtoServiceFunction(protoName, PS_ADDTOLIST, icqAddToList);

 	CreateProtoServiceFunction(protoName, PS_FILERESUME, icqFileResume);

 

-	CreateProtoServiceFunction(protoName, PSS_GETINFO, icqGetInfo);

+	CreateProtoServiceFunction(protoName, PS_GETINFO, icqGetInfo);

 	CreateProtoServiceFunction(protoName, PSS_MESSAGE, icqSendMessage);

-	CreateProtoServiceFunction(protoName, PSS_GETAWAYMSG, icqGetAwayMsg);

+	CreateProtoServiceFunction(protoName, PS_GETAWAYMSG, icqGetAwayMsg);

 	CreateProtoServiceFunction(protoName, PSS_FILE, icqSendFile);

-	CreateProtoServiceFunction(protoName, PSS_FILEALLOW, icqFileAllow);

-	CreateProtoServiceFunction(protoName, PSS_FILEDENY, icqFileDeny);

-	CreateProtoServiceFunction(protoName, PSS_FILECANCEL, icqFileCancel);

+	CreateProtoServiceFunction(protoName, PS_FILEALLOW, icqFileAllow);

+	CreateProtoServiceFunction(protoName, PS_FILEDENY, icqFileDeny);

+	CreateProtoServiceFunction(protoName, PS_FILECANCEL, icqFileCancel);

 

 	CreateProtoServiceFunction(protoName, PSR_MESSAGE, icqRecvMessage);

 	CreateProtoServiceFunction(protoName, PSR_AWAYMSG, icqRecvAwayMsg);

diff --git a/protocols/NewsAggregator/Src/NewsAggregator.cpp b/protocols/NewsAggregator/Src/NewsAggregator.cpp
index 420cbd9ec6..32be6949e1 100644
--- a/protocols/NewsAggregator/Src/NewsAggregator.cpp
+++ b/protocols/NewsAggregator/Src/NewsAggregator.cpp
@@ -67,7 +67,7 @@ int CMPlugin::Load()
 	CreateProtoServiceFunction(MODULENAME, PS_SETSTATUS, NewsAggrSetStatus);
 	CreateProtoServiceFunction(MODULENAME, PS_GETSTATUS, NewsAggrGetStatus);
 	CreateProtoServiceFunction(MODULENAME, PS_LOADICON, NewsAggrLoadIcon);
-	CreateProtoServiceFunction(MODULENAME, PSS_GETINFO, NewsAggrGetInfo);
+	CreateProtoServiceFunction(MODULENAME, PS_GETINFO, NewsAggrGetInfo);
 	CreateProtoServiceFunction(MODULENAME, PS_GETAVATARINFO, NewsAggrGetAvatarInfo);
 	CreateProtoServiceFunction(MODULENAME, PSR_MESSAGE, NewsAggrRecvMessage);
 
diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp
index b9e3c61d9c..50987d47f5 100644
--- a/protocols/Sametime/src/sametime_proto.cpp
+++ b/protocols/Sametime/src/sametime_proto.cpp
@@ -244,15 +244,6 @@ HANDLE CSametimeProto::GetAwayMsg(MCONTACT hContact)
 	return nullptr;

 }

 

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

-{

-	debugLogW(L"CSametimeProto::RecvAwayMsg()  hContact=[%x], mode=[%d]", hContact, mode);

-

-	ptrW pszMsg(mir_utf8decodeW(evt->szMessage));

-	ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)evt->lParam, pszMsg);

-	return 0;

-}

-

 int CSametimeProto::SetAwayMsg(int iStatus, const wchar_t* msg)

 {

 	debugLogW(L"CSametimeProto::SetAwayMsg()  iStatus=[%d], msg:len=[%d]", iStatus, msg == nullptr ? -1 : mir_wstrlen(msg));

diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h
index 6c3bd27e9e..fb8bdc629c 100644
--- a/protocols/Sametime/src/sametime_proto.h
+++ b/protocols/Sametime/src/sametime_proto.h
@@ -33,7 +33,6 @@ struct CSametimeProto : public PROTO<CSametimeProto>
 	int      SetStatus(int iNewStatus) override;

 

 	HANDLE   GetAwayMsg(MCONTACT hContact) override;

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

 	int      SetAwayMsg(int iStatus, const wchar_t* msg) override;

 

 	int      UserIsTyping(MCONTACT hContact, int type) override;

diff --git a/protocols/Weather/src/weather_svcs.cpp b/protocols/Weather/src/weather_svcs.cpp
index 757e243910..3c4c775347 100644
--- a/protocols/Weather/src/weather_svcs.cpp
+++ b/protocols/Weather/src/weather_svcs.cpp
@@ -271,9 +271,9 @@ void InitServices(void)
 	CreateProtoServiceFunction(MODULENAME, PS_BASICSEARCH, WeatherBasicSearch);
 	CreateProtoServiceFunction(MODULENAME, PS_SEARCHBYEMAIL, WeatherBasicSearch);
 	CreateProtoServiceFunction(MODULENAME, PS_ADDTOLIST, WeatherAddToList);
-	CreateProtoServiceFunction(MODULENAME, PSS_GETINFO, WeatherGetInfo);
+	CreateProtoServiceFunction(MODULENAME, PS_GETINFO, WeatherGetInfo);
 	CreateProtoServiceFunction(MODULENAME, PS_GETAVATARINFO, WeatherGetAvatarInfo);
-	CreateProtoServiceFunction(MODULENAME, PSS_GETAWAYMSG, WeatherGetAwayMsg);
+	CreateProtoServiceFunction(MODULENAME, PS_GETAWAYMSG, WeatherGetAwayMsg);
 	CreateProtoServiceFunction(MODULENAME, PS_CREATEADVSEARCHUI, WeatherCreateAdvancedSearchUI);
 	CreateProtoServiceFunction(MODULENAME, PS_SEARCHBYADVANCED, WeatherAdvancedSearch);
 	CreateProtoServiceFunction(MODULENAME, PS_GETADVANCEDSTATUSICON, WeatherAdvancedStatusIcon);
diff --git a/protocols/WebView/src/main.cpp b/protocols/WebView/src/main.cpp
index eb67282a15..77375f0e63 100644
--- a/protocols/WebView/src/main.cpp
+++ b/protocols/WebView/src/main.cpp
@@ -64,7 +64,7 @@ void InitServices()
 	CreateProtoServiceFunction(MODULENAME, PS_GETSTATUS, GetStatus);

 	CreateProtoServiceFunction(MODULENAME, PS_BASICSEARCH, BasicSearch);

 	CreateProtoServiceFunction(MODULENAME, PS_ADDTOLIST, AddToList);

-	CreateProtoServiceFunction(MODULENAME, PSS_GETINFO, GetInfo);

+	CreateProtoServiceFunction(MODULENAME, PS_GETINFO, GetInfo);

 }

 

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