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

4 files changed, 6 insertions, 15 deletions

diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp
index d138c4d4fc..33c2407aa7 100644
--- a/protocols/JabberG/src/jabber_ft.cpp
+++ b/protocols/JabberG/src/jabber_ft.cpp
@@ -361,7 +361,7 @@ void CJabberProto::FtHandleSiRequest(HXML iqNode)
 				ft->std.totalBytes = ft->std.currentFileSize = filesize;

 

 				PROTORECVFILET pre = { 0 };

-				pre.flags = PREF_TCHAR;

+				pre.dwFlags = PRFF_TCHAR;

 				pre.fileCount = 1;

 				pre.timestamp = time(NULL);

 				pre.ptszFiles = (TCHAR**)&filename;

diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index 675b0cefbb..c382e37d38 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -673,7 +673,7 @@ BOOL CJabberProto::OnIqRequestOOB(HXML, CJabberIqInfo *pInfo)
 		JabberHttpUrlDecode(str2);

 

 		PROTORECVFILET pre;

-		pre.flags = PREF_TCHAR;

+		pre.dwFlags = PRFF_TCHAR;

 		pre.timestamp = time(NULL);

 		pre.tszDescription = desc;

 		pre.ptszFiles = &str2;

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 58e48abc36..a7663e7624 100644
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -574,7 +574,7 @@ DWORD_PTR __cdecl CJabberProto::GetCaps(int type, MCONTACT hContact)
 	case PFLAGNUM_3:

 		return PF2_ONLINE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_HEAVYDND | PF2_FREECHAT;

 	case PFLAGNUM_4:

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

+		return PF4_FORCEAUTH | PF4_NOCUSTOMAUTH | PF4_NOAUTHDENYREASON | PF4_SUPPORTTYPING | PF4_AVATARS | PF4_FORCEADDED;

 	case PFLAG_UNIQUEIDTEXT:

 		return (DWORD_PTR)Translate("JID");

 	case PFLAG_UNIQUEIDSETTING:

@@ -956,7 +956,7 @@ void __cdecl CJabberProto::SendMessageAckThread(void* param)
 static char PGP_PROLOG[] = "-----BEGIN PGP MESSAGE-----\r\n\r\n";

 static char PGP_EPILOG[] = "\r\n-----END PGP MESSAGE-----\r\n";

 

-int __cdecl CJabberProto::SendMsg(MCONTACT hContact, int flags, const char* pszSrc)

+int __cdecl CJabberProto::SendMsg(MCONTACT hContact, int, const char* pszSrc)

 {

 	TCHAR szClientJid[JABBER_MAX_JID_LEN];

 	if (!m_bJabberOnline || !GetClientJID(hContact, szClientJid, SIZEOF(szClientJid))) {

@@ -965,9 +965,7 @@ int __cdecl CJabberProto::SendMsg(MCONTACT hContact, int flags, const char* pszS
 		return 1;

 	}

 

-	TCHAR *msg;

 	int  isEncrypted, id = SerialNext();

-

 	if (!strncmp(pszSrc, PGP_PROLOG, strlen(PGP_PROLOG))) {

 		const char *szEnd = strstr(pszSrc, PGP_EPILOG);

 		char *tempstring = (char*)alloca(strlen(pszSrc) + 1);

@@ -976,17 +974,11 @@ int __cdecl CJabberProto::SendMsg(MCONTACT hContact, int flags, const char* pszS
 		tempstring[nStrippedLength] = 0;

 		pszSrc = tempstring;

 		isEncrypted = 1;

-		flags &= ~PREF_UNICODE;

 	}

 	else isEncrypted = 0;

 

-	if (flags & PREF_UTF)

-		mir_utf8decode(NEWSTR_ALLOCA(pszSrc), &msg);

-	else if (flags & PREF_UNICODE)

-		msg = mir_u2t((wchar_t*)&pszSrc[strlen(pszSrc) + 1]);

-	else

-		msg = mir_a2t(pszSrc);

-

+	TCHAR *msg;

+	mir_utf8decode(NEWSTR_ALLOCA(pszSrc), &msg);

 	if (msg == NULL)

 		return 0;

 

diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp
index 0c5f428ff2..f185af3e33 100644
--- a/protocols/JabberG/src/jabber_thread.cpp
+++ b/protocols/JabberG/src/jabber_thread.cpp
@@ -1376,7 +1376,6 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData *info)
 		msgTime = now;

 

 	PROTORECVEVENT recv = { 0 };

-	recv.flags = PREF_UTF;

 	recv.timestamp = (DWORD)msgTime;

 	recv.szMessage = buf;

 	recv.lParam = (LPARAM)((pFromResource != NULL && m_options.EnableRemoteControl) ? pFromResource->m_tszResourceName : 0);