From e2c2a1f5a84c6c9b705dc85c6a2dd1f97edd57e4 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 22 May 2015 16:04:17 +0000
Subject: T2Utf - handy replacement for ptrA<mir_utf8decodeT()>

git-svn-id: http://svn.miranda-ng.org/main/trunk@13758 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/JabberG/src/jabber_thread.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'protocols/JabberG/src/jabber_thread.cpp')

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 917a0af363..c5c18a6453 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -205,15 +205,14 @@ void CJabberProto::xmlStreamInitializeNow(ThreadData *info)
 		xmlAddAttr(stream, _T("version"), _T("1.0"));
 
 	LPTSTR xmlQuery = xi.toString(n, NULL);
-	char* buf = mir_utf8encodeT(xmlQuery);
+	T2Utf buf(xmlQuery);
 	int bufLen = (int)mir_strlen(buf);
 	if (bufLen > 2) {
-		strdel(buf + bufLen - 2, 1);
+		strdel((char*)buf + bufLen - 2, 1);
 		bufLen--;
 	}
 
 	info->send(buf, bufLen);
-	mir_free(buf);
 	xi.freeMem(xmlQuery);
 	xi.destroyNode(n);
 }
@@ -1987,9 +1986,8 @@ int ThreadData::send(HXML node)
 	*q = 0;
 
 
-	char* utfStr = mir_utf8encodeT(str);
+	T2Utf utfStr(str);
 	int result = send(utfStr, (int)mir_strlen(utfStr));
-	mir_free(utfStr);
 
 	xi.freeMem(str);
 	return result;
-- 
cgit v1.2.3