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
Unmaintained
KDE Pim
Commits
d1c9e290
Commit
d1c9e290
authored
Sep 15, 2012
by
Laurent Montel
😁
Browse files
Fix Bug 298831 - Kmail2 crash on save as draft
FIXED-IN: 4.9.2 BUG: 298831
parent
38c2cbea
Changes
2
Hide whitespace changes
Inline
Side-by-side
messagecomposer/composerviewbase.cpp
View file @
d1c9e290
...
...
@@ -927,20 +927,29 @@ void Message::ComposerViewBase::slotSaveMessage( KJob* job )
Akonadi
::
Collection
target
;
Akonadi
::
Item
item
=
job
->
property
(
"Akonadi::Item"
).
value
<
Akonadi
::
Item
>
();
if
(
job
->
error
()
)
{
if
(
mSaveIn
==
MessageSender
::
SaveInTemplates
)
{
target
=
Akonadi
::
SpecialMailCollections
::
self
()
->
defaultCollection
(
Akonadi
::
SpecialMailCollections
::
Templates
);
}
else
{
target
=
Akonadi
::
SpecialMailCollections
::
self
()
->
defaultCollection
(
Akonadi
::
SpecialMailCollections
::
Drafts
);
}
target
=
defaultSpecialTarget
();
}
else
{
const
Akonadi
::
CollectionFetchJob
*
fetchJob
=
qobject_cast
<
Akonadi
::
CollectionFetchJob
*>
(
job
);
target
=
fetchJob
->
collections
().
first
();
if
(
fetchJob
->
collections
().
isEmpty
())
target
=
defaultSpecialTarget
();
else
target
=
fetchJob
->
collections
().
first
();
}
Akonadi
::
ItemCreateJob
*
create
=
new
Akonadi
::
ItemCreateJob
(
item
,
target
,
this
);
connect
(
create
,
SIGNAL
(
result
(
KJob
*
)),
this
,
SLOT
(
slotCreateItemResult
(
KJob
*
))
);
m_pendingQueueJobs
++
;
}
Akonadi
::
Collection
Message
::
ComposerViewBase
::
defaultSpecialTarget
()
const
{
Akonadi
::
Collection
target
;
if
(
mSaveIn
==
MessageSender
::
SaveInTemplates
)
{
target
=
Akonadi
::
SpecialMailCollections
::
self
()
->
defaultCollection
(
Akonadi
::
SpecialMailCollections
::
Templates
);
}
else
{
target
=
Akonadi
::
SpecialMailCollections
::
self
()
->
defaultCollection
(
Akonadi
::
SpecialMailCollections
::
Drafts
);
}
return
target
;
}
void
Message
::
ComposerViewBase
::
slotCreateItemResult
(
KJob
*
job
)
{
...
...
messagecomposer/composerviewbase.h
View file @
d1c9e290
...
...
@@ -256,6 +256,7 @@ private slots:
void
slotSaveMessage
(
KJob
*
job
);
private:
Akonadi
::
Collection
defaultSpecialTarget
()
const
;
/**
* Searches the mime tree, where root is the root node, for embedded images,
* extracts them froom the body and adds them to the editor.
...
...
Write
Preview
Markdown
is supported
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