end of the city legend that PSS_MESSAGEW ever existed

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

4 files changed, 1 insertions, 22 deletions

diff --git a/plugins/MirOTR/MirOTR/src/dllmain.cpp b/plugins/MirOTR/MirOTR/src/dllmain.cpp
index f8eb373fec..c17b1b6b76 100644
--- a/plugins/MirOTR/MirOTR/src/dllmain.cpp
+++ b/plugins/MirOTR/MirOTR/src/dllmain.cpp
@@ -95,10 +95,8 @@ extern "C" __declspec(dllexport) int Load(void)
 

 	// create our services

 	CreateProtoServiceFunction(MODULENAME, PSS_MESSAGE, SVC_OTRSendMessage);

-	CreateProtoServiceFunction(MODULENAME, PSS_MESSAGE"W", SVC_OTRSendMessageW);

 	CreateProtoServiceFunction(MODULENAME, PSR_MESSAGE, SVC_OTRRecvMessage);

 

-

 	// hook modules loaded for updater support

 	HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);

 

diff --git a/plugins/MirOTR/MirOTR/src/otr.cpp b/plugins/MirOTR/MirOTR/src/otr.cpp
index c7f37b9ac6..e22f7adb18 100644
--- a/plugins/MirOTR/MirOTR/src/otr.cpp
+++ b/plugins/MirOTR/MirOTR/src/otr.cpp
@@ -141,17 +141,8 @@ extern "C" {
 		//MessageBox(0, message, "OTR Inject", MB_OK);

 		HANDLE hContact = (HANDLE)opdata;

 

-		if(protocol && db_get_w(hContact, protocol, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) {

-			/* this would be with translation

-			TCHAR *decode = mir_utf8decodeT(message);

-			TCHAR *encode = mir_utf8encodeT(TranslateT(decide));

-			mir_free(decode);

-			CallContactService(hContact, PSS_MESSAGE, PREF_UTF|PREF_BYPASS_OTR, (LPARAM)encode);

-			mir_free(encode);

-			*/

+		if(protocol && db_get_w(hContact, protocol, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE)

 			CallContactService(hContact, PSS_MESSAGE, PREF_UTF|PREF_BYPASS_OTR, (LPARAM)message);

-			//DEBUGOUT_T("INJECT")

-		}

 	}

 

 	/* Display a notification message for a particular accountname /

diff --git a/plugins/MirOTR/MirOTR/src/svcs_proto.cpp b/plugins/MirOTR/MirOTR/src/svcs_proto.cpp
index ed7b16bd96..2f814087e2 100644
--- a/plugins/MirOTR/MirOTR/src/svcs_proto.cpp
+++ b/plugins/MirOTR/MirOTR/src/svcs_proto.cpp
@@ -124,15 +124,6 @@ INT_PTR SVC_OTRSendMessage(WPARAM wParam,LPARAM lParam){
 	return CallService(MS_PROTO_CHAINSEND, wParam, lParam);

 }

 

-INT_PTR SVC_OTRSendMessageW(WPARAM wParam, LPARAM lParam){

-	if (!lParam) return 0;

-

-	CCSDATA *ccs = (CCSDATA *) lParam;

-	if (!(ccs->wParam & PREF_UTF)) ccs->wParam |= PREF_UNICODE;

-

-	return SVC_OTRSendMessage(wParam, lParam);

-}

-

 /*

 #define MESSAGE_PREFIX			"(OTR) "

 #define MESSAGE_PREFIXW			L"(OTR) "

diff --git a/plugins/MirOTR/MirOTR/src/svcs_proto.h b/plugins/MirOTR/MirOTR/src/svcs_proto.h
index fe0db53a4e..a260560cc6 100644
--- a/plugins/MirOTR/MirOTR/src/svcs_proto.h
+++ b/plugins/MirOTR/MirOTR/src/svcs_proto.h
@@ -1,7 +1,6 @@
 #pragma once

 

 INT_PTR SVC_OTRSendMessage(WPARAM wParam,LPARAM lParam);

-INT_PTR SVC_OTRSendMessageW(WPARAM wParam, LPARAM lParam);

 INT_PTR SVC_OTRRecvMessage(WPARAM wParam,LPARAM lParam);

 

 void otr_abort_smp(ConnContext *context);