Commit d1bf69d7 authored by Laurent Montel's avatar Laurent Montel 😁

Merge remote-tracking branch 'origin/Applications/17.04'

parents a6d2bdbf a82b27b3
......@@ -93,3 +93,8 @@ void KMComposerUpdateTemplateJob::setIdent(const KIdentityManagement::Identity &
{
mIdent = ident;
}
void KMComposerUpdateTemplateJob::setCollection(const Akonadi::Collection &col)
{
mCollectionForNewMessage = col;
}
......@@ -46,6 +46,7 @@ public:
void setIdent(const KIdentityManagement::Identity &ident);
void setCollection(const Akonadi::Collection &col);
Q_SIGNALS:
void updateComposer(const KIdentityManagement::Identity &ident, const KMime::Message::Ptr &msg, uint uoid, uint uoldId, bool wasModified);
......
......@@ -962,6 +962,7 @@ void KMComposerWin::applyTemplate(uint uoid, uint uOldId, const KIdentityManagem
job->setUoldId(uOldId);
job->setUoid(uoid);
job->setIdent(ident);
job->setCollection(mCollectionForNewMessage);
job->start();
} else {
if (auto hrd = mMsg->headerByType("X-KMail-Link-Message")) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment