the ancient atavism extincted: PROTORECVFILE structure with its own set of flags

2 files changed, 6 insertions, 14 deletions

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index 22513f3cf2..3e39833635 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -1026,13 +1026,9 @@ retry:
 

 			const char *fileName = (const char*)dcc7->filename;

 

-			PROTORECVFILE pre = {};

-			pre.fileCount = 1;

-			pre.timestamp = time(0);

-			pre.descr.a = fileName;

-			pre.files.a = &fileName;

-			pre.pUserInfo = dcc7;

-			ProtoChainRecvFile((UINT_PTR)dcc7->contact, &pre);

+			DB::EventInfo dbei;

+			dbei.timestamp = time(0);

+			ProtoChainRecvFile((UINT_PTR)dcc7->contact, DB::FILE_BLOB(dcc7, fileName, fileName), dbei);

 

 			e->event.dcc7_new = nullptr;

 		}

diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp
index cebb9279a1..9377736402 100644
--- a/protocols/Gadu-Gadu/src/filetransfer.cpp
+++ b/protocols/Gadu-Gadu/src/filetransfer.cpp
@@ -367,15 +367,11 @@ void __cdecl GaduProto::dccmainthread(void*)
 						local_dcc->contact = (void*)getcontact(local_dcc->peer_uin, 0, 0, nullptr);

 						const char *pszFileName = (const char *)m_dcc->file_info.filename;

 

-						PROTORECVFILE pre = {};

-						pre.fileCount = 1;

-						pre.timestamp = time(0);

-						pre.descr.a = pszFileName;

-						pre.files.a = &pszFileName;

-						pre.pUserInfo = local_dcc;

+						DB::EventInfo dbei;

+						dbei.timestamp = time(0);

 

 						gg_LeaveCriticalSection(&ft_mutex, "dccmainthread", 37, 7, "ft_mutex", 1);

-						ProtoChainRecvFile((UINT_PTR)local_dcc->contact, &pre);

+						ProtoChainRecvFile((UINT_PTR)local_dcc->contact, DB::FILE_BLOB(local_dcc, pszFileName, pszFileName), dbei);

 						gg_EnterCriticalSection(&ft_mutex, "dccmainthread", 37, "ft_mutex", 1);

 					}

 					break;