summaryrefslogtreecommitdiff
path: root/protocols/IcqOscarJ/oscar_filetransfer.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-09-27 14:35:51 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-09-27 14:35:51 +0000
commit93b1c035da40df23e3eef4a1efd10dfe9c451375 (patch)
tree0a12592b9a7b5f76a1614ebf72e5cdef8827ec4c /protocols/IcqOscarJ/oscar_filetransfer.cpp
parentb6bd986a22906775c3f2c6e18ad67ca602298869 (diff)
fix for the file description's encoding (ICQ file receiving)
git-svn-id: http://svn.miranda-ng.org/main/trunk@1683 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/IcqOscarJ/oscar_filetransfer.cpp')
-rw-r--r--protocols/IcqOscarJ/oscar_filetransfer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/protocols/IcqOscarJ/oscar_filetransfer.cpp b/protocols/IcqOscarJ/oscar_filetransfer.cpp
index a1f516d363..9630abc070 100644
--- a/protocols/IcqOscarJ/oscar_filetransfer.cpp
+++ b/protocols/IcqOscarJ/oscar_filetransfer.cpp
@@ -557,7 +557,6 @@ void CIcqProto::handleRecvServMsgOFT(BYTE *buf, WORD wLen, DWORD dwUin, char *sz
HANDLE hContact = HContactFromUID(dwUin, szUID, &bAdded);
ft->hContact = hContact;
- ft->szDescription = pszDescription;
ft->fileId = -1;
// Send chain event
@@ -566,13 +565,13 @@ void CIcqProto::handleRecvServMsgOFT(BYTE *buf, WORD wLen, DWORD dwUin, char *sz
strcpy(szBlob + sizeof(DWORD), pszFileName);
strcpy(szBlob + sizeof(DWORD) + strlennull(pszFileName) + 1, pszDescription);
- TCHAR* ptszFileName = mir_a2t(pszFileName);
+ TCHAR* ptszFileName = mir_utf8decodeT(pszFileName);
PROTORECVFILET pre = {0};
pre.flags = PREF_TCHAR;
pre.fileCount = 1;
pre.timestamp = time(NULL);
- pre.tszDescription = mir_a2t(pszDescription);
+ pre.tszDescription = mir_utf8decodeT(pszDescription);
pre.ptszFiles = &ptszFileName;
pre.lParam = (LPARAM)ft;