Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
f4902459
Commit
f4902459
authored
4 years ago
by
Sébastien Blin
Committed by
Andreas Traczyk
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/datatransfermodel.cpp
+8
-0
8 additions, 0 deletions
src/datatransfermodel.cpp
src/qtwrapper/configurationmanager_wrap.h
+1
-1
1 addition, 1 deletion
src/qtwrapper/configurationmanager_wrap.h
with
9 additions
and
1 deletion
src/datatransfermodel.cpp
+
8
−
0
View file @
f4902459
...
...
@@ -157,7 +157,11 @@ DataTransferModel::sendFile(const QString& account_id,
const
QString
&
display_name
)
{
DataTransferInfo
info
;
#ifdef ENABLE_LIBWRAP
DRing
::
DataTransferId
id
;
#else
qulonglong
id
;
#endif
info
.
accountId
=
account_id
;
info
.
peer
=
peer_uri
;
info
.
path
=
file_path
;
...
...
@@ -173,9 +177,13 @@ void
DataTransferModel
::
bytesProgress
(
int
interactionId
,
int64_t
&
total
,
int64_t
&
progress
)
{
ConfigurationManager
::
instance
()
#ifdef ENABLE_LIBWRAP
.
dataTransferBytesProgress
(
pimpl_
->
lrc2dringIdMap
.
at
(
interactionId
),
total
,
progress
);
#else
.
dataTransferBytesProgress
(
pimpl_
->
lrc2dringIdMap
.
at
(
interactionId
),
reinterpret_cast
<
qlonglong
&>
(
total
),
reinterpret_cast
<
qlonglong
&>
(
progress
));
#endif
}
QString
...
...
This diff is collapsed.
Click to expand it.
src/qtwrapper/configurationmanager_wrap.h
+
1
−
1
View file @
f4902459
...
...
@@ -741,7 +741,7 @@ public Q_SLOTS: // METHODS
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_info
.
accountId
=
lrc_info
.
accountId
.
toStdString
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment