Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Automate
Agent sessions
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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
1130d6a6
Commit
1130d6a6
authored
Sep 29, 2023
by
Sébastien Blin
Committed by
Adrien Béraud
Sep 30, 2023
Browse files
Options
Downloads
Patches
Plain Diff
data_transfer: do not use fmt::format with std::filesystem
jami-client-qt#1354
Change-Id: I1153a1dfd3215b3fb03afe9b3ac4f39aad99fdf8
parent
129214da
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/data_transfer.cpp
+2
-2
2 additions, 2 deletions
src/data_transfer.cpp
with
2 additions
and
2 deletions
src/data_transfer.cpp
+
2
−
2
View file @
1130d6a6
...
@@ -519,9 +519,9 @@ TransferManager::onIncomingProfile(const std::shared_ptr<dhtnet::ChannelSocket>&
...
@@ -519,9 +519,9 @@ TransferManager::onIncomingProfile(const std::shared_ptr<dhtnet::ChannelSocket>&
info
.
accountId
=
pimpl_
->
accountId_
;
info
.
accountId
=
pimpl_
->
accountId_
;
info
.
conversationId
=
pimpl_
->
to_
;
info
.
conversationId
=
pimpl_
->
to_
;
auto
recvDir
=
fmt
::
format
(
"{:s}/{:s}/vcard/"
,
fileutils
::
get_cache_dir
()
,
pimpl_
->
accountId_
)
;
auto
recvDir
=
fileutils
::
get_cache_dir
()
/
pimpl_
->
accountId_
/
"vcard"
;
dhtnet
::
fileutils
::
recursive_mkdir
(
recvDir
);
dhtnet
::
fileutils
::
recursive_mkdir
(
recvDir
);
info
.
path
=
fmt
::
format
(
"{:s}
{:s}
_{:s}_{}"
,
recvDir
,
deviceId
,
uri
,
tid
);
info
.
path
=
recvDir
/
fmt
::
format
(
"{:s}_{:s}_{}"
,
deviceId
,
uri
,
tid
);
auto
ifile
=
std
::
make_shared
<
IncomingFile
>
(
std
::
move
(
channel
),
info
,
"profile.vcf"
,
""
,
sha3Sum
);
auto
ifile
=
std
::
make_shared
<
IncomingFile
>
(
std
::
move
(
channel
),
info
,
"profile.vcf"
,
""
,
sha3Sum
);
auto
res
=
pimpl_
->
vcards_
.
emplace
(
idx
,
std
::
move
(
ifile
));
auto
res
=
pimpl_
->
vcards_
.
emplace
(
idx
,
std
::
move
(
ifile
));
...
...
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
sign in
to comment