From 78c5552be2f00a4ac25bd77ca39386522fca70a8 Mon Sep 17 00:00:00 2001 From: Montel Laurent <montel@kde.org> Date: Fri, 2 Jun 2017 13:59:02 +0200 Subject: Make sure that we use plugin when we use sendlater feature --- src/editor/kmcomposerwin.cpp | 9 +++++---- src/editor/kmcomposerwin.h | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp index c077055..c879821 100644 --- a/src/editor/kmcomposerwin.cpp +++ b/src/editor/kmcomposerwin.cpp @@ -2395,7 +2395,7 @@ void KMComposerWin::printComposeResult(KJob *job, bool preview) } void KMComposerWin::doSend(MessageComposer::MessageSender::SendMethod method, - MessageComposer::MessageSender::SaveIn saveIn) + MessageComposer::MessageSender::SaveIn saveIn, bool willSendItWithoutReediting) { // TODO integrate with MDA online status if (method == MessageComposer::MessageSender::SendImmediate) { @@ -2404,7 +2404,7 @@ void KMComposerWin::doSend(MessageComposer::MessageSender::SendMethod method, } } - if (saveIn == MessageComposer::MessageSender::SaveInNone) { // don't save as draft or template, send immediately + if (saveIn == MessageComposer::MessageSender::SaveInNone || willSendItWithoutReediting) { // don't save as draft or template, send immediately if (KEmailAddress::firstEmailAddress(from()).isEmpty()) { if (!(mShowHeaders & HDR_FROM)) { mShowHeaders |= HDR_FROM; @@ -2588,6 +2588,7 @@ void KMComposerWin::slotSendLater() if (!checkRecipientNumber()) { return; } + mComposerBase->setSendLaterInfo(nullptr); if (mComposerBase->editor()->checkExternalEditorFinished()) { const bool wasRegistered = (SendLater::SendLaterUtil::sentLaterAgentWasRegistered() && SendLater::SendLaterUtil::sentLaterAgentEnabled()); if (wasRegistered) { @@ -2610,9 +2611,9 @@ void KMComposerWin::slotSendLater() case SendLater::SendLaterDialog::SendDeliveryAtTime: { mComposerBase->setSendLaterInfo(info); if (info->isRecurrence()) { - doSend(MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInTemplates); + doSend(MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInTemplates, true); } else { - doSend(MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInDrafts); + doSend(MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInDrafts, true); } break; } diff --git a/src/editor/kmcomposerwin.h b/src/editor/kmcomposerwin.h index 9e85566..58a47c6 100644 --- a/src/editor/kmcomposerwin.h +++ b/src/editor/kmcomposerwin.h @@ -514,7 +514,8 @@ private: * Send the message. */ void doSend(MessageComposer::MessageSender::SendMethod method = MessageComposer::MessageSender::SendDefault, - MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone); + MessageComposer::MessageSender::SaveIn saveIn = MessageComposer::MessageSender::SaveInNone, + bool willSendItWithoutReediting = false); void doDelayedSend(MessageComposer::MessageSender::SendMethod method, MessageComposer::MessageSender::SaveIn saveIn); -- cgit v0.11.2