From 48266e479d1fcf5153b29c612866845990fccad8 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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
---
 plugins/SecureIM/src/mmi.cpp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'plugins/SecureIM/src/mmi.cpp')

diff --git a/plugins/SecureIM/src/mmi.cpp b/plugins/SecureIM/src/mmi.cpp
index 45361fd5ad..e75a076472 100644
--- a/plugins/SecureIM/src/mmi.cpp
+++ b/plugins/SecureIM/src/mmi.cpp
@@ -105,22 +105,11 @@ void __fastcall safe_delete(void** p)
 // преобразуем текст из чистого UTF8 в формат миранды
 LPSTR utf8_to_miranda(LPCSTR szUtfMsg, DWORD& flags)
 {
-	flags &= ~PREF_UNICODE;	flags |= PREF_UTF;
 	return mir_strdup(szUtfMsg);
 }
 
 // преобразуем текст из формата миранды в чистый UTF8
 LPSTR miranda_to_utf8(LPCSTR szMirMsg, DWORD flags)
 {
-	LPSTR szNewMsg;
-	if (flags & PREF_UTF)
-		szNewMsg = (LPSTR)szMirMsg;
-	else if (flags & PREF_UNICODE)
-		szNewMsg = exp->utf8encode((LPCWSTR)(szMirMsg + strlen(szMirMsg) + 1));
-	else {
-		LPWSTR wszMirMsg = mir_a2u(szMirMsg);
-		szNewMsg = exp->utf8encode(wszMirMsg);
-		mir_free(wszMirMsg);
-	}
-	return mir_strdup(szNewMsg);
+	return mir_strdup(szMirMsg);
 }
-- 
cgit v1.2.3