From 726069ec50be8be30e8465c1328b178a2573fd75 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 18 Jan 2019 18:53:33 +0300
Subject: PSS_URL removed as totally obsolete

---
 protocols/EmLanProto/src/amdproto.cpp |  8 +-------
 protocols/EmLanProto/src/mlan.cpp     | 14 ++------------
 protocols/EmLanProto/src/mlan.h       |  2 +-
 3 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'protocols/EmLanProto/src')

diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp
index 55dfb598e1..99746894a0 100644
--- a/protocols/EmLanProto/src/amdproto.cpp
+++ b/protocols/EmLanProto/src/amdproto.cpp
@@ -103,12 +103,7 @@ INT_PTR __cdecl EMPSetStatus(WPARAM new_status, LPARAM)
 
 static INT_PTR __cdecl EMPSendMessage(WPARAM, LPARAM lParam)
 {
-	return g_lan->SendMessageUrl((CCSDATA*)lParam, false);
-}
-
-static INT_PTR __cdecl EMPSendUrl(WPARAM, LPARAM lParam)
-{
-	return g_lan->SendMessageUrl((CCSDATA*)lParam, true);
+	return g_lan->SendMessageUrl((CCSDATA*)lParam);
 }
 
 static INT_PTR __cdecl EMPRecvMessageUrl(WPARAM, LPARAM lParam)
@@ -338,7 +333,6 @@ int CMPlugin::Load()
 	CreateProtoServiceFunction(MODULENAME, PS_BASICSEARCH, EMPBasicSearch);
 	CreateProtoServiceFunction(MODULENAME, PS_ADDTOLIST, EMPAddToList);
 	CreateProtoServiceFunction(MODULENAME, PSS_MESSAGE, EMPSendMessage);
-	CreateProtoServiceFunction(MODULENAME, PSS_URL, EMPSendUrl);
 	CreateProtoServiceFunction(MODULENAME, PSR_MESSAGE, EMPRecvMessageUrl);
 	CreateProtoServiceFunction(MODULENAME, PSR_URL, EMPRecvMessageUrl);
 	CreateProtoServiceFunction(MODULENAME, PSS_GETAWAYMSG, EMPGetAwayMsg);
diff --git a/protocols/EmLanProto/src/mlan.cpp b/protocols/EmLanProto/src/mlan.cpp
index d20ef97336..cf15c9f7e2 100644
--- a/protocols/EmLanProto/src/mlan.cpp
+++ b/protocols/EmLanProto/src/mlan.cpp
@@ -383,20 +383,10 @@ INT_PTR CMLan::AddToContactList(u_int flags, EMPSEARCHRESULT *psr)
 	return (INT_PTR)contact;
 }
 
-int CMLan::SendMessageUrl(CCSDATA *ccs, bool isUrl)
+int CMLan::SendMessageUrl(CCSDATA *ccs)
 {
 	int cid = GetRandomProcId();
-	size_t len = 0;
-	if (isUrl) {
-		len = mir_strlen((char*)ccs->lParam);
-		((char*)ccs->lParam)[len] = 1;
-	}
-	TDataHolder *hold = new TDataHolder(ccs, cid, isUrl ? LEXT_SENDURL : LEXT_SENDMESSAGE, this);
-	if (isUrl) {
-		((char*)ccs->lParam)[len] = 0;
-		hold->msg[len] = 0;
-	}
-	mir_forkthread(LaunchExt, hold);
+	mir_forkthread(LaunchExt, new TDataHolder(ccs, cid, LEXT_SENDMESSAGE, this));
 	return cid;
 }
 
diff --git a/protocols/EmLanProto/src/mlan.h b/protocols/EmLanProto/src/mlan.h
index 27fad4e9ee..1af49fe6ce 100644
--- a/protocols/EmLanProto/src/mlan.h
+++ b/protocols/EmLanProto/src/mlan.h
@@ -52,7 +52,7 @@ public:
 	void SetMirandaStatus(u_int status);
 	void SetAllOffline();
 	void RecvMessageUrl(CCSDATA* ccs);
-	int SendMessageUrl(CCSDATA* ccs, bool isUrl);
+	int SendMessageUrl(CCSDATA* ccs);
 	int GetAwayMsg(CCSDATA* ccs);
 	int RecvAwayMsg(CCSDATA* ccs);
 	int SetAwayMsg(u_int status, char* msg);
-- 
cgit v1.2.3