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

1 files changed, 2 insertions, 8 deletions

diff --git a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
index 917977dad5..8ac157c740 100644
--- a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
+++ b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
@@ -499,19 +499,13 @@ void CIcqProto::handleRecvServMsgOFT(BYTE *buf, size_t wLen, DWORD dwUin, char *
 				strcpy(szBlob + sizeof(DWORD), pszFileName);

 				strcpy(szBlob + sizeof(DWORD) + mir_strlen(pszFileName) + 1, pszDescription);

 

-				TCHAR* ptszFileName = mir_utf8decodeT(pszFileName);

-

 				PROTORECVFILET pre = { 0 };

-				pre.flags = PREF_TCHAR;

 				pre.fileCount = 1;

 				pre.timestamp = time(NULL);

-				pre.tszDescription = mir_utf8decodeT(pszDescription);

-				pre.ptszFiles = &ptszFileName;

+				pre.szDescription = pszDescription;

+				pre.pszFiles = &pszFileName;

 				pre.lParam = (LPARAM)ft;

 				ProtoChainRecvFile(hContact, &pre);

-

-				mir_free(pre.tszDescription);

-				mir_free(ptszFileName);

 			}

 			else if (wAckType == 2) { // First attempt failed, reverse requested

 				oscar_filetransfer *ft = FindOscarTransfer(hContact, dwID1, dwID2);