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

3 files changed, 6 insertions, 15 deletions

diff --git a/protocols/MRA/src/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp
index f6b1e3ebd8..8ab0e44bb4 100644
--- a/protocols/MRA/src/MraFilesQueue.cpp
+++ b/protocols/MRA/src/MraFilesQueue.cpp
@@ -692,7 +692,7 @@ DWORD CMraProto::MraFilesQueueAddReceive(HANDLE hFilesQueueHandle, DWORD dwFlags
 

 	// Send chain event

 	PROTORECVFILET prf;

-	prf.flags = PREF_UNICODE;

+	prf.dwFlags = PRFF_UNICODE;

 	prf.timestamp = _time32(NULL);

 	prf.tszDescription = dat->pwszDescription;

 	prf.fileCount = 1;//dat->dwFilesCount;

diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp
index 7274ba6954..f22cb1cfdf 100644
--- a/protocols/MRA/src/MraProto.cpp
+++ b/protocols/MRA/src/MraProto.cpp
@@ -272,7 +272,7 @@ DWORD_PTR CMraProto::GetCaps(int type, MCONTACT)
 		return PF2_ONLINE | PF2_INVISIBLE | PF2_SHORTAWAY | PF2_HEAVYDND | PF2_FREECHAT | PF2_ONTHEPHONE;

 

 	case PFLAGNUM_4:

-		return PF4_FORCEAUTH | PF4_FORCEADDED | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_IMSENDUTF;

+		return PF4_FORCEAUTH | PF4_FORCEADDED | PF4_SUPPORTTYPING | PF4_AVATARS;

 

 	case PFLAGNUM_5:

 		return PF2_ONTHEPHONE;

@@ -385,7 +385,7 @@ HANDLE CMraProto::SendFile(MCONTACT hContact, const TCHAR*, TCHAR **ppszFiles)
 	return (HANDLE)iRet;

 }

 

-int CMraProto::SendMsg(MCONTACT hContact, int flags, const char *lpszMessage)

+int CMraProto::SendMsg(MCONTACT hContact, int, const char *lpszMessage)

 {

 	if (!m_bLoggedIn) {

 		ProtoBroadcastAck(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, NULL, (LPARAM)"You cannot send when you are offline.");

@@ -393,15 +393,7 @@ int CMraProto::SendMsg(MCONTACT hContact, int flags, const char *lpszMessage)
 	}

 

 	DWORD dwFlags = 0;

-	CMStringW wszMessage;

-

-	if (flags & PREF_UNICODE)

-		wszMessage = (LPWSTR)(lpszMessage + mir_strlen(lpszMessage) + 1);

-	else if (flags & PREF_UTF)

-		wszMessage = ptrW(mir_utf8decodeT(lpszMessage));

-	else

-		wszMessage = ptrW(mir_a2t(lpszMessage));

-

+	CMStringW wszMessage(ptrW(mir_utf8decodeT(lpszMessage)));

 	if (wszMessage.IsEmpty()) {

 		ProtoBroadcastAck(hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, NULL, (LPARAM)"Cant allocate buffer for convert to unicode.");

 		return 0;

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);

 					}