summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_thread.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-05-22 16:04:17 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-05-22 16:04:17 +0000
commite2c2a1f5a84c6c9b705dc85c6a2dd1f97edd57e4 (patch)
treeba79bdcede96f80039f8b88d2791f198b9ec2981 /protocols/JabberG/src/jabber_thread.cpp
parentf8e34b5f83f3ce5f39d541e9068b6b8cb6d92acd (diff)
T2Utf - handy replacement for ptrA<mir_utf8decodeT()>
git-svn-id: http://svn.miranda-ng.org/main/trunk@13758 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src/jabber_thread.cpp')
-rw-r--r--protocols/JabberG/src/jabber_thread.cpp8
1 files changed, 3 insertions, 5 deletions
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;