From 010952c5c2dde278a024f6876e8189b949ea5dcf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 19 Jan 2024 15:44:57 +0300 Subject: the ancient atavism extincted: PROTORECVFILE structure with its own set of flags --- protocols/Sametime/src/files.cpp | 10 +++------- protocols/Sametime/src/sametime_proto.cpp | 4 ++-- protocols/Sametime/src/sametime_proto.h | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) (limited to 'protocols/Sametime/src') diff --git a/protocols/Sametime/src/files.cpp b/protocols/Sametime/src/files.cpp index 7f82f74ca5..d5c375682d 100644 --- a/protocols/Sametime/src/files.cpp +++ b/protocols/Sametime/src/files.cpp @@ -36,13 +36,9 @@ void mwFileTransfer_offered(mwFileTransfer* ft) else strncpy_s(description, filename, _TRUNCATE); - PROTORECVFILE pre = {}; - pre.fileCount = 1; - pre.timestamp = time(0); - pre.descr.a = description; - pre.files.a = &filename; - pre.pUserInfo = ft; - ProtoChainRecvFile(hContact, &pre); + DB::EventInfo dbei; + dbei.timestamp = time(0); + ProtoChainRecvFile(hContact, DB::FILE_BLOB(ft, filename, description), dbei); } //returns 0 if finished with current file diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp index 50987d47f5..7f6c4e6cc5 100644 --- a/protocols/Sametime/src/sametime_proto.cpp +++ b/protocols/Sametime/src/sametime_proto.cpp @@ -162,14 +162,14 @@ HWND CSametimeProto::CreateExtendedSearchUI(HWND owner) } -MEVENT CSametimeProto::RecvFile(MCONTACT hContact, PROTORECVFILE* pre) +MEVENT CSametimeProto::RecvFile(MCONTACT hContact, DB::FILE_BLOB &blob, DB::EventInfo &dbei) { debugLogW(L"CSametimeProto::RecvFile() hContact=[%x]", hContact); Contact::Hide(hContact, false); Contact::PutOnList(hContact); - return CSuper::RecvFile(hContact, pre); + return CSuper::RecvFile(hContact, blob, dbei); } MEVENT CSametimeProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre) diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h index fb8bdc629c..159dfa36e8 100644 --- a/protocols/Sametime/src/sametime_proto.h +++ b/protocols/Sametime/src/sametime_proto.h @@ -24,7 +24,7 @@ struct CSametimeProto : public PROTO HANDLE SearchAdvanced(HWND owner) override; HWND CreateExtendedSearchUI(HWND owner) override; - MEVENT RecvFile(MCONTACT hContact, PROTORECVFILE*) override; + MEVENT RecvFile(MCONTACT hContact, DB::FILE_BLOB &blob, DB::EventInfo &dbei) override; MEVENT RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override; HANDLE SendFile(MCONTACT hContact, const wchar_t* szDescription, wchar_t** ppszFiles) override; -- cgit v1.2.3