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, 9 insertions, 18 deletions

diff --git a/src/modules/metacontacts/meta_services.cpp b/src/modules/metacontacts/meta_services.cpp
index 7c10f7de2f..9d3a0c89a0 100644
--- a/src/modules/metacontacts/meta_services.cpp
+++ b/src/modules/metacontacts/meta_services.cpp
@@ -63,7 +63,7 @@ INT_PTR Meta_GetCaps(WPARAM wParam, LPARAM lParam)
 		return PF2_ONLINE | PF2_INVISIBLE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND | PF2_FREECHAT | PF2_OUTTOLUNCH | PF2_ONTHEPHONE;

 

 	case PFLAGNUM_4:

-		return PF4_SUPPORTTYPING | PF4_AVATARS | PF4_IMSENDUTF;

+		return PF4_SUPPORTTYPING | PF4_AVATARS;

 

 	case PFLAGNUM_5:

 		return PF2_INVISIBLE | PF2_SHORTAWAY | PF2_LONGAWAY | PF2_LIGHTDND | PF2_HEAVYDND | PF2_FREECHAT | PF2_OUTTOLUNCH | PF2_ONTHEPHONE;

diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp
index 2a0c2b9b2a..3787696bd9 100644
--- a/src/modules/protocols/protocols.cpp
+++ b/src/modules/protocols/protocols.cpp
@@ -124,20 +124,14 @@ static INT_PTR Proto_RecvMessage(WPARAM, LPARAM lParam)
 	ptrA pszTemp;

 	mir_ptr<BYTE> pszBlob;

 

-	DBEVENTINFO dbei = { sizeof(dbei) };

+	DBEVENTINFO dbei = { 0 };

+	dbei.cbSize = sizeof(dbei);

+	dbei.flags = DBEF_UTF;

 	dbei.szModule = GetContactProto(ccs->hContact);

 	dbei.timestamp = pre->timestamp;

 	dbei.eventType = EVENTTYPE_MESSAGE;

-	if (pre->flags & PREF_UNICODE) {

-		pszTemp = mir_utf8encodeT(pre->tszMessage);

-		dbei.pBlob = (PBYTE)(char*)pszTemp;

-		dbei.cbBlob = (DWORD)strlen(pszTemp) + 1;

-		dbei.flags |= DBEF_UTF;

-	}

-	else {

-		dbei.cbBlob = (DWORD)strlen(pre->szMessage) + 1;

-		dbei.pBlob = (PBYTE)pre->szMessage;

-	}

+	dbei.cbBlob = (DWORD)strlen(pre->szMessage) + 1;

+	dbei.pBlob = (PBYTE)pre->szMessage;

 

 	if (pre->cbCustomDataSize != 0) {

 		pszBlob = (PBYTE)mir_alloc(dbei.cbBlob + pre->cbCustomDataSize);

@@ -149,8 +143,6 @@ static INT_PTR Proto_RecvMessage(WPARAM, LPARAM lParam)
 

 	if (pre->flags & PREF_CREATEREAD)

 		dbei.flags |= DBEF_READ;

-	if (pre->flags & PREF_UTF)

-		dbei.flags |= DBEF_UTF;

 	if (pre->flags & PREF_SENT)

 		dbei.flags |= DBEF_SENT;

 

@@ -164,8 +156,7 @@ static INT_PTR Proto_AuthRecv(WPARAM wParam, LPARAM lParam)
 	DBEVENTINFO dbei = { sizeof(dbei) };

 	dbei.szModule = (char*)wParam;

 	dbei.timestamp = pre->timestamp;

-	dbei.flags = pre->flags & (PREF_CREATEREAD ? DBEF_READ : 0);

-	dbei.flags |= (pre->flags & PREF_UTF) ? DBEF_UTF : 0;

+	dbei.flags = DBEF_UTF | pre->flags & (PREF_CREATEREAD ? DBEF_READ : 0);

 	dbei.eventType = EVENTTYPE_AUTHREQUEST;

 	dbei.cbBlob = pre->lParam;

 	dbei.pBlob = (PBYTE)pre->szMessage;

diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp
index 9152877e44..d6b9a9f39f 100644
--- a/src/modules/protocols/protoint.cpp
+++ b/src/modules/protocols/protoint.cpp
@@ -208,9 +208,9 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE
 		return res;

 	}

 

-	int __cdecl SendMsg(MCONTACT hContact, int flags, const char* msg)

+	int __cdecl SendMsg(MCONTACT hContact, const char* msg)

 	{

-		CCSDATA ccs = { hContact, PSS_MESSAGE, flags, (LPARAM)msg };

+		CCSDATA ccs = { hContact, PSS_MESSAGE, 0, (LPARAM)msg };

 		return (int)ProtoCallService(m_szModuleName, PSS_MESSAGE, 0, (LPARAM)&ccs);

 	}