diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-05-21 16:11:58 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-05-21 16:11:58 +0000 |
| commit | 48266e479d1fcf5153b29c612866845990fccad8 (patch) | |
| tree | c8cbc908cd3c5f08731e5e8d7eaac6b568007d09 /protocols/MRA/src/Mra_proto.cpp | |
| parent | ebdb556f152734035846f120eb8112f88ef91281 (diff) | |
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
Diffstat (limited to 'protocols/MRA/src/Mra_proto.cpp')
| -rw-r--r-- | protocols/MRA/src/Mra_proto.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index 53fa0e572b..f17cc8ce60 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -1781,8 +1781,8 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA & if (m_heNudgeReceived)
NotifyEventHooks(m_heNudgeReceived, hContact, NULL);
else {
- pre.flags = PREF_UNICODE;
- pre.szMessage = (LPSTR)TranslateTS(MRA_ALARM_MESSAGE);
+ ptrA szMsg(mir_utf8encodeT(TranslateTS(MRA_ALARM_MESSAGE)));
+ pre.szMessage = szMsg;
ProtoChainRecvMsg(hContact, &pre);
}
}
@@ -1797,7 +1797,6 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA & // some plugins can change pre.szMessage pointer and we failed to free it
ptrA lpszMessageUTF(mir_utf8encodeW(wszMessage));
pre.szMessage = lpszMessageUTF;
- pre.flags = PREF_UTF;
ProtoChainRecvMsg(hContact, &pre);
}
|