Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE
kdepim.6886
use-plugin-for-sendlater.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File use-plugin-for-sendlater.patch of Package kdepim.6886
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(-) Index: kdepim-16.08.2/kmail/src/editor/kmcomposerwin.cpp =================================================================== --- kdepim-16.08.2.orig/kmail/src/editor/kmcomposerwin.cpp +++ kdepim-16.08.2/kmail/src/editor/kmcomposerwin.cpp @@ -2371,7 +2371,7 @@ void KMComposerWin::printComposeResult(K } 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) { @@ -2380,7 +2380,7 @@ void KMComposerWin::doSend(MessageCompos } } - 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; @@ -2561,6 +2561,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) { @@ -2583,9 +2584,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; } Index: kdepim-16.08.2/kmail/src/editor/kmcomposerwin.h =================================================================== --- kdepim-16.08.2.orig/kmail/src/editor/kmcomposerwin.h +++ kdepim-16.08.2/kmail/src/editor/kmcomposerwin.h @@ -496,7 +496,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);
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor