Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KMail
Commits
2fc86ab9
Commit
2fc86ab9
authored
Oct 15, 2020
by
Laurent Montel
😁
Browse files
Merge remote-tracking branch 'origin/release/20.08' into master
parents
1ee518dd
a4715e7e
Pipeline
#37709
canceled with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/job/opencomposerjob.cpp
View file @
2fc86ab9
...
...
@@ -67,6 +67,10 @@ void OpenComposerJob::start()
if
(
!
mOpenComposerSettings
.
mReplyTo
.
isEmpty
())
{
mMsg
->
replyTo
()
->
fromUnicodeString
(
mOpenComposerSettings
.
mReplyTo
,
"utf-8"
);
}
if
(
!
mOpenComposerSettings
.
mInReplyTo
.
isEmpty
())
{
mMsg
->
inReplyTo
()
->
fromUnicodeString
(
mOpenComposerSettings
.
mInReplyTo
,
"utf-8"
);
}
if
(
!
mOpenComposerSettings
.
mMessageFile
.
isEmpty
()
&&
QFile
::
exists
(
mOpenComposerSettings
.
mMessageFile
))
{
QFile
f
(
mOpenComposerSettings
.
mMessageFile
);
...
...
@@ -107,7 +111,7 @@ void OpenComposerJob::slotOpenComposer()
if
(
!
mOpenComposerSettings
.
mTo
.
isEmpty
())
{
cWin
->
setFocusToSubject
();
}
QList
<
QUrl
>
attachURLs
=
QUrl
::
fromStringList
(
mOpenComposerSettings
.
mAttachmentPaths
);
const
QList
<
QUrl
>
attachURLs
=
QUrl
::
fromStringList
(
mOpenComposerSettings
.
mAttachmentPaths
);
QList
<
QUrl
>::
ConstIterator
endAttachment
(
attachURLs
.
constEnd
());
QVector
<
KMail
::
Composer
::
AttachmentInfo
>
infoList
;
for
(
QList
<
QUrl
>::
ConstIterator
it
=
attachURLs
.
constBegin
();
it
!=
endAttachment
;
++
it
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment