major atavism, PROTORECVEVENT, died with its own set of constants

2 files changed, 9 insertions, 9 deletions

diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index f36ec8d236..28350171b2 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -697,14 +697,14 @@ bool CIrcProto::OnIrc_PRIVMSG(const CIrcMessage *pmsg)
 			}

 

 			MCONTACT hContact = CList_AddContact(&user, false, true);

+			T2Utf utf(mess);

 

-			PROTORECVEVENT pre = {};

-			pre.timestamp = (uint32_t)time(0);

-			pre.szMessage = mir_utf8encodeW(mess);

+			DB::EventInfo dbei;

+			dbei.timestamp = (uint32_t)time(0);

+			dbei.pBlob = utf;

 			setWString(hContact, "User", pmsg->prefix.sUser);

 			setWString(hContact, "Host", pmsg->prefix.sHost);

-			ProtoChainRecvMsg(hContact, &pre);

-			mir_free(pre.szMessage);

+			ProtoChainRecvMsg(hContact, dbei);

 			return true;

 		}

 

diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index 4b6737f153..2861324bb0 100644
--- a/protocols/IRCG/src/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
@@ -1274,10 +1274,10 @@ void CDccSession::DoChatReceive()
 
 			if (*pStart) {
 				// send it off to some messaging module
-				PROTORECVEVENT pre = {};
-				pre.timestamp = (uint32_t)time(0);
-				pre.szMessage = pStart;
-				ProtoChainRecvMsg(di->hContact, &pre);
+				DB::EventInfo dbei;
+				dbei.timestamp = (uint32_t)time(0);
+				dbei.pBlob = pStart;
+				ProtoChainRecvMsg(di->hContact, dbei);
 			}
 
 			cbInBuf -= pEnd - pStart;