diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-22 16:04:17 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-22 16:04:17 +0000 |
| commit | e2c2a1f5a84c6c9b705dc85c6a2dd1f97edd57e4 (patch) | |
| tree | ba79bdcede96f80039f8b88d2791f198b9ec2981 /protocols/JabberG/src/jabber_file.cpp | |
| parent | f8e34b5f83f3ce5f39d541e9068b6b8cb6d92acd (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_file.cpp')
| -rw-r--r-- | protocols/JabberG/src/jabber_file.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp index 1c51a3b87e..d962cac51e 100644 --- a/protocols/JabberG/src/jabber_file.cpp +++ b/protocols/JabberG/src/jabber_file.cpp @@ -277,7 +277,7 @@ void __cdecl CJabberProto::FileServerThread(filetransfer *ft) else
p = ft->std.ptszFiles[i];
- char *pFileName = mir_urlEncode(ptrA(mir_utf8encodeT(p)));
+ ptrA pFileName(mir_urlEncode(T2Utf(p)));
if (pFileName != NULL) {
ft->szId = JabberId2string(SerialNext());
@@ -290,8 +290,6 @@ void __cdecl CJabberProto::FileServerThread(filetransfer *ft) char szAddr[256];
mir_snprintf(szAddr, SIZEOF(szAddr), "http://%s:%d/%s", myAddr, nlb.wPort, pFileName);
- mir_free(pFileName);
-
size_t len = mir_tstrlen(ptszResource) + mir_tstrlen(ft->jid) + 2;
TCHAR *fulljid = (TCHAR *)alloca(sizeof(TCHAR) * len);
mir_sntprintf(fulljid, len, _T("%s/%s"), ft->jid, ptszResource);
|