From a19fd509b8d4b3df08f61d7aa74e45dd7a527ee3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 18 Jan 2018 12:58:35 +0300 Subject: perhaps it was last problem with utf8... --- protocols/ICQCorp/src/services.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'protocols/ICQCorp/src/services.cpp') diff --git a/protocols/ICQCorp/src/services.cpp b/protocols/ICQCorp/src/services.cpp index baa649f307..163f0bd9fa 100644 --- a/protocols/ICQCorp/src/services.cpp +++ b/protocols/ICQCorp/src/services.cpp @@ -189,18 +189,20 @@ static INT_PTR icqSendMessage(WPARAM, LPARAM lParam) static INT_PTR icqRecvMessage(WPARAM, LPARAM lParam) { - T("[ ] recieve message\n"); + T("[ ] receive message\n"); CCSDATA *ccs = (CCSDATA*)lParam; db_unset(ccs->hContact, "CList", "Hidden"); PROTORECVEVENT *pre = (PROTORECVEVENT*)ccs->lParam; - ptrA szMsg(Utf8CheckString(pre->szMessage) ? mir_strdup(pre->szMessage) : mir_utf8encode(pre->szMessage)); + ptrA szMsg(mir_utf8encode(pre->szMessage)); DBEVENTINFO dbei = {}; dbei.szModule = protoName; dbei.timestamp = pre->timestamp; - dbei.flags = DBEF_UTF | (pre->flags & PREF_CREATEREAD) ? DBEF_READ : 0; + dbei.flags = DBEF_UTF; + if (pre->flags & PREF_CREATEREAD) + dbei.flags |= DBEF_READ; dbei.eventType = EVENTTYPE_MESSAGE; dbei.cbBlob = (DWORD)mir_strlen(szMsg) + 1; dbei.pBlob = (PBYTE)szMsg.get(); @@ -227,7 +229,7 @@ static INT_PTR icqSendUrl(WPARAM, LPARAM lParam) static INT_PTR icqRecvUrl(WPARAM, LPARAM lParam) { - T("[ ] recieve url\n"); + T("[ ] receive url\n"); CCSDATA *ccs = (CCSDATA*)lParam; PROTORECVEVENT *pre = (PROTORECVEVENT*)ccs->lParam; @@ -398,7 +400,7 @@ static INT_PTR icqFileCancel(WPARAM, LPARAM lParam) static INT_PTR icqRecvFile(WPARAM, LPARAM lParam) { - T("[ ] recieve file\n"); + T("[ ] receive file\n"); CCSDATA *ccs = (CCSDATA *)lParam; db_unset(ccs->hContact, "CList", "Hidden"); -- cgit v1.2.3