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

3 files changed, 10 insertions, 24 deletions

diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp
index 30ee8c1fed..f6b5520c8d 100644
--- a/protocols/JabberG/src/jabber_file.cpp
+++ b/protocols/JabberG/src/jabber_file.cpp
@@ -175,14 +175,10 @@ void CJabberProto::FileProcessHttpDownload(MCONTACT hContact, const char *jid, c
 			ft->dwExpectedRecvFileSize = ft->std.currentFileSize = atoi(p);

 	}

 

-	PROTORECVFILE pre = {};

-	pre.dwFlags = PRFF_UTF | PRFF_SILENT;

-	pre.fileCount = 1;

-	pre.timestamp = time(0);

-	pre.files.a = &pszName;

-	pre.pUserInfo = ft;

-	pre.descr.a = pszDescr;

-	ProtoChainRecvFile(ft->std.hContact, &pre);

+	DB::EventInfo dbei;

+	dbei.flags = DBEF_TEMPORARY;

+	dbei.timestamp = time(0);

+	ProtoChainRecvFile(ft->std.hContact, DB::FILE_BLOB(ft, szName, pszDescr), dbei);

 }

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp
index 0da72701ad..10900907f1 100644
--- a/protocols/JabberG/src/jabber_ft.cpp
+++ b/protocols/JabberG/src/jabber_ft.cpp
@@ -466,14 +466,9 @@ void CJabberProto::FtHandleSiRequest(const TiXmlElement *iqNode)
 				ft->std.szCurrentFile.w = mir_utf8decodeW(filename);

 				ft->std.totalBytes = ft->std.currentFileSize = filesize;

 

-				PROTORECVFILE pre = {};

-				pre.dwFlags = PRFF_UTF;

-				pre.fileCount = 1;

-				pre.timestamp = time(0);

-				pre.files.a = &filename;

-				pre.pUserInfo = ft;

-				pre.descr.a = XmlGetChildText(fileNode, "desc");

-				ProtoChainRecvFile(ft->std.hContact, &pre);

+				DB::EventInfo dbei;

+				dbei.timestamp = time(0);

+				ProtoChainRecvFile(ft->std.hContact, DB::FILE_BLOB(ft, filename, XmlGetChildText(fileNode, "desc")), dbei);

 				return;

 			}

 		}

diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index d7abb95ff2..1dd1dd43c6 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -323,14 +323,9 @@ bool CJabberProto::OnIqRequestOOB(const TiXmlElement*, CJabberIqInfo *pInfo)
 		else

 			str2 = ft->httpPath;

 

-		PROTORECVFILE pre = {};

-		pre.dwFlags = PRFF_UTF;

-		pre.timestamp = time(0);

-		pre.descr.a = desc;

-		pre.files.a = &str2;

-		pre.fileCount = 1;

-		pre.pUserInfo = ft;

-		ProtoChainRecvFile(ft->std.hContact, &pre);

+		DB::EventInfo dbei;

+		dbei.timestamp = time(0);

+		ProtoChainRecvFile(ft->std.hContact, DB::FILE_BLOB(ft, str2, desc), dbei);

 	}

 	else { // reject

 		XmlNodeIq iq("error", pInfo);