From ab3d423b1dc514e9db61c170ca14bab49e5280cb Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 26 Jan 2024 23:34:30 +0300
Subject: major atavism, PROTORECVEVENT, died with its own set of constants
---
protocols/Sametime/src/messaging.cpp | 9 ++++-----
protocols/Sametime/src/sametime_proto.cpp | 4 ++--
protocols/Sametime/src/sametime_proto.h | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
(limited to 'protocols/Sametime')
diff --git a/protocols/Sametime/src/messaging.cpp b/protocols/Sametime/src/messaging.cpp
index 4def7ca30d..15650b9c6f 100644
--- a/protocols/Sametime/src/messaging.cpp
+++ b/protocols/Sametime/src/messaging.cpp
@@ -81,11 +81,10 @@ void mwIm_conversation_recv(mwConversation* conv, mwImSendType type, gconstpoint
if (type != mwImSend_PLAIN)
return;
- PROTORECVEVENT pre = {};
- time_t t = time(0);
- pre.timestamp = t;
- pre.szMessage = (char*)msg;
- ProtoChainRecvMsg(hContact, &pre);
+ DB::EventInfo dbei;
+ dbei.timestamp = time(0);
+ dbei.pBlob = (char*)msg;
+ ProtoChainRecvMsg(hContact, dbei);
}
void mwIm_place_invite(struct mwConversation* conv, const char* message, const char*, const char*)
diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp
index 1174ec9481..9359562cca 100644
--- a/protocols/Sametime/src/sametime_proto.cpp
+++ b/protocols/Sametime/src/sametime_proto.cpp
@@ -171,14 +171,14 @@ MEVENT CSametimeProto::RecvFile(MCONTACT hContact, DB::FILE_BLOB &blob, DB::Even
return CSuper::RecvFile(hContact, blob, dbei);
}
-MEVENT CSametimeProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)
+MEVENT CSametimeProto::RecvMsg(MCONTACT hContact, DB::EventInfo &dbei)
{
debugLogW(L"CSametimeProto::RecvMsg() hContact=[%x]", hContact);
Contact::Hide(hContact, false);
Contact::PutOnList(hContact);
- return CSuper::RecvMsg(hContact, pre);
+ return CSuper::RecvMsg(hContact, dbei);
}
HANDLE CSametimeProto::SendFile(MCONTACT hContact, const wchar_t* szDescription, wchar_t** ppszFiles)
diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h
index 11d5002beb..b1eb82a7b0 100644
--- a/protocols/Sametime/src/sametime_proto.h
+++ b/protocols/Sametime/src/sametime_proto.h
@@ -25,7 +25,7 @@ struct CSametimeProto : public PROTO<CSametimeProto>
HWND CreateExtendedSearchUI(HWND owner) override;
MEVENT RecvFile(MCONTACT hContact, DB::FILE_BLOB &blob, DB::EventInfo &dbei) override;
- MEVENT RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;
+ MEVENT RecvMsg(MCONTACT hContact, DB::EventInfo &dbei) override;
HANDLE SendFile(MCONTACT hContact, const wchar_t* szDescription, wchar_t** ppszFiles) override;
int SendMsg(MCONTACT hContact, MEVENT, const char* msg) override;
--
cgit v1.2.3