Skip to content
Snippets Groups Projects
Commit f4902459 authored by Sébastien Blin's avatar Sébastien Blin Committed by Andreas Traczyk
Browse files

misc: fix for build with libwrap on Linux

Change-Id: Ia2addcb9573855cd6a13575c487c411cbb668d81
parent 4381acbf
No related branches found
No related tags found
No related merge requests found
...@@ -157,7 +157,11 @@ DataTransferModel::sendFile(const QString& account_id, ...@@ -157,7 +157,11 @@ DataTransferModel::sendFile(const QString& account_id,
const QString& display_name) const QString& display_name)
{ {
DataTransferInfo info; DataTransferInfo info;
#ifdef ENABLE_LIBWRAP
DRing::DataTransferId id;
#else
qulonglong id; qulonglong id;
#endif
info.accountId = account_id; info.accountId = account_id;
info.peer = peer_uri; info.peer = peer_uri;
info.path = file_path; info.path = file_path;
...@@ -173,9 +177,13 @@ void ...@@ -173,9 +177,13 @@ void
DataTransferModel::bytesProgress(int interactionId, int64_t& total, int64_t& progress) DataTransferModel::bytesProgress(int interactionId, int64_t& total, int64_t& progress)
{ {
ConfigurationManager::instance() ConfigurationManager::instance()
#ifdef ENABLE_LIBWRAP
.dataTransferBytesProgress(pimpl_->lrc2dringIdMap.at(interactionId), total, progress);
#else
.dataTransferBytesProgress(pimpl_->lrc2dringIdMap.at(interactionId), .dataTransferBytesProgress(pimpl_->lrc2dringIdMap.at(interactionId),
reinterpret_cast<qlonglong&>(total), reinterpret_cast<qlonglong&>(total),
reinterpret_cast<qlonglong&>(progress)); reinterpret_cast<qlonglong&>(progress));
#endif
} }
QString QString
......
...@@ -741,7 +741,7 @@ public Q_SLOTS: // METHODS ...@@ -741,7 +741,7 @@ public Q_SLOTS: // METHODS
VectorULongLong dataTransferList() { return convertVectorULongLong(DRing::dataTransferList()); } VectorULongLong dataTransferList() { return convertVectorULongLong(DRing::dataTransferList()); }
uint32_t sendFile(const DataTransferInfo& lrc_info, uint64_t& id) uint32_t sendFile(const DataTransferInfo& lrc_info, DRing::DataTransferId& id)
{ {
DRing::DataTransferInfo dring_info; DRing::DataTransferInfo dring_info;
dring_info.accountId = lrc_info.accountId.toStdString(); dring_info.accountId = lrc_info.accountId.toStdString();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment