perhaps it was last problem with utf8...

3 files changed, 12 insertions, 10 deletions

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

diff --git a/protocols/ICQCorp/src/transfer.cpp b/protocols/ICQCorp/src/transfer.cpp
index f17f5616de..f8b42e5b87 100644
--- a/protocols/ICQCorp/src/transfer.cpp
+++ b/protocols/ICQCorp/src/transfer.cpp
@@ -75,7 +75,7 @@ void ICQTransfer::processTcpPacket(Packet &packet)
 	packet >> cmd;

 	switch (cmd) {

 	case 0x00:

-		T("[tcp] recieve initialising file transfer\n");

+		T("[tcp] receive initialising file transfer\n");

 		packet >> junkLong

 			>> count

 			>> totalSize

@@ -98,7 +98,7 @@ void ICQTransfer::processTcpPacket(Packet &packet)
 		break;

 

 	case 0x02:

-		T("[tcp] recieve next file\n");

+		T("[tcp] receive next file\n");

 		packet >> directory

 			>> szFileName

 			>> directoryName

@@ -143,7 +143,7 @@ void ICQTransfer::processTcpPacket(Packet &packet)
 		break;

 

 	case 0x04:

-		T("[tcp] recieve stop file\n");

+		T("[tcp] receive stop file\n");

 		packet >> junkLong;

 

 		totalProgress += fileSize - fileProgress;

@@ -153,7 +153,7 @@ void ICQTransfer::processTcpPacket(Packet &packet)
 		break;

 

 	case 0x05:

-		T("[tcp] recieve new speed\n");

+		T("[tcp] receive new speed\n");

 		packet >> speed;

 		break;

 

diff --git a/protocols/ICQCorp/src/version.h b/protocols/ICQCorp/src/version.h
index a23a9bf9dd..08518dd17d 100644
--- a/protocols/ICQCorp/src/version.h
+++ b/protocols/ICQCorp/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION          0

 #define __MINOR_VERSION          2

 #define __RELEASE_NUM            0

-#define __BUILD_NUM              1

+#define __BUILD_NUM              2

 

 #include <stdver.h>