From 48266e479d1fcf5153b29c612866845990fccad8 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 21 May 2015 16:11:58 +0000 Subject: war against atavisms continues - everything that goes to PSS_MESSAGE should be sent as utf8 string; - thus PREF_UNICODE & PREF_UTF support discontinued, these constants are removed; - support for PREF_UNICODE & PREF_UTF in protocols also removed; - PREF_UNICODE used in file transfers (PROTOFILERECVT) replaced with PRFF_UNICODE / PRFF_TCHAR git-svn-id: http://svn.miranda-ng.org/main/trunk@13734 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Sametime/src/messaging.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'protocols/Sametime/src/messaging.cpp') diff --git a/protocols/Sametime/src/messaging.cpp b/protocols/Sametime/src/messaging.cpp index e6e953b38f..ce457d3611 100644 --- a/protocols/Sametime/src/messaging.cpp +++ b/protocols/Sametime/src/messaging.cpp @@ -84,7 +84,6 @@ void mwIm_conversation_recv(mwConversation* conv, mwImSendType type, gconstpoint PROTORECVEVENT pre = { 0 }; time_t t = time(NULL); pre.timestamp = t; - pre.flags = PREF_UTF; pre.szMessage = (char*)msg; ProtoChainRecvMsg(hContact, &pre); } @@ -113,7 +112,7 @@ mwImHandler mwIm_handler = { NULL }; -HANDLE CSametimeProto::SendMessageToUser(MCONTACT hContact, char* msg_utf8) +HANDLE CSametimeProto::SendMessageToUser(MCONTACT hContact, const char *szMsg) { debugLog(_T("CSametimeProto::SendMessageToUser() hContact=[%x]"), hContact); @@ -128,12 +127,12 @@ HANDLE CSametimeProto::SendMessageToUser(MCONTACT hContact, char* msg_utf8) if (!mwConversation_isOpen(conv)) { debugLog(_T("CSametimeProto::SendMessageToUser() mwConversation_isOpen")); mir_cslock lck(q_cs); - contact_message_queue[hContact].push(msg_utf8); + contact_message_queue[hContact].push(szMsg); mwConversation_open(conv); } else { debugLog(_T("CSametimeProto::SendMessageToUser() !mwConversation_isOpen")); - mwConversation_send(conv, mwImSend_PLAIN, (gconstpointer)msg_utf8); + mwConversation_send(conv, mwImSend_PLAIN, szMsg); } free(id_block.user); -- cgit v1.2.3