new macroses for MS_PROTO_CHAINRECV: ProtoChainRecv, ProtoChainRecvMsg & ProtoChainRecvFile

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

1 files changed, 2 insertions, 16 deletions

diff --git a/plugins/MirOTR/MirOTR/src/utils.cpp b/plugins/MirOTR/MirOTR/src/utils.cpp
index ea9b55b619..f15987716b 100644
--- a/plugins/MirOTR/MirOTR/src/utils.cpp
+++ b/plugins/MirOTR/MirOTR/src/utils.cpp
@@ -320,14 +320,8 @@ void ShowMessageInline(const HANDLE hContact, const TCHAR *msg) {
 	char *utf = mir_utf8encodeT(buff);

 	pre.szMessage = utf;

 	pre.flags = PREF_UTF|PREF_BYPASS_OTR;

-	//CallContactService(hContact, PSR_MESSAGE, 0, (LPARAM)&pre);

+	ProtoChainRecvMsg(hContact, &pre);	

 

-	CCSDATA ccs = {0};

-	ccs.hContact = hContact;

-	ccs.szProtoService = PSR_MESSAGE;

-	ccs.lParam = (LPARAM)⪯

-

-	CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);

 	mir_free(utf);

 }

 

@@ -339,17 +333,9 @@ void ShowMessageInlineUtf(const HANDLE hContact, const char *msg) {
 	pre.timestamp = time(0);

 	pre.szMessage = buff;

 	pre.flags = PREF_UTF|PREF_BYPASS_OTR;

-	//CallContactService(hContact, PSR_MESSAGE, 0, (LPARAM)&pre);

-

-	CCSDATA ccs = {0};

-	ccs.hContact = hContact;

-	ccs.szProtoService = PSR_MESSAGE;

-	ccs.lParam = (LPARAM)⪯

-

-	CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);

+	ProtoChainRecvMsg(hContact, &pre);

 }

 

-

 void ShowMessageUtf(const HANDLE hContact, const char *msg) {

 	if(options.msg_inline)

 		ShowMessageInlineUtf(hContact, msg);