Commit d1b97223 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use MailCommon::MDNWarningJob directly

parent 0a492e5c
Pipeline #213169 passed with stage
in 7 minutes and 36 seconds
......@@ -1186,7 +1186,7 @@ void KMMainWidget::createWidgets()
connect(kmkernel->folderCollectionMonitor(), &Monitor::collectionStatisticsChanged, this, &KMMainWidget::slotCollectionStatisticsChanged);
}
void KMMainWidget::slotSendMdnResponse(MessageViewer::MDNWarningWidget::ResponseType type)
void KMMainWidget::slotSendMdnResponse(MessageViewer::MDNWarningWidget::ResponseType type, KMime::MDN::SendingMode sendingMode)
{
MailCommon::MDNWarningJob::ResponseMDN response = MailCommon::MDNWarningJob::ResponseMDN::Unknown;
switch (type) {
......@@ -1204,7 +1204,7 @@ void KMMainWidget::slotSendMdnResponse(MessageViewer::MDNWarningWidget::Response
auto job = new MailCommon::MDNWarningJob(KMKernel::self(), this);
job->setItem(mMessagePane->currentItem());
job->setResponse(response);
// FIXME job->setSendingMode();
job->setSendingMode(sendingMode);
job->start();
connect(job, &MDNWarningJob::finished, this, [this]() {
mMsgView->viewer()->mdnWarning()->animatedHide();
......
......@@ -515,7 +515,7 @@ private Q_SLOTS:
void slotReplyMessageTo(const KMime::Message::Ptr &message, bool replyToAll);
private:
void slotSendMdnResponse(MessageViewer::MDNWarningWidget::ResponseType type);
void slotSendMdnResponse(MessageViewer::MDNWarningWidget::ResponseType type, KMime::MDN::SendingMode sendingMode);
void slotSetFocusToViewer();
void deleteSelectedMessages(bool confirmDelete); // completely delete message
bool showSearchDialog();
......
......@@ -24,7 +24,7 @@
#include <Akonadi/OpenEmailAddressJob>
#include <KEmailAddress>
#include <MailCommon/MailUtil>
#include <MailCommon/SendMdnHandler>
// #include <MailCommon/SendMdnHandler>
#include <MessageViewer/CSSHelper>
#include <MessageViewer/HeaderStrategy>
#include <MessageViewer/MarkMessageReadHandler>
......@@ -99,7 +99,7 @@ KMReaderWin::KMReaderWin(QWidget *aParent, QWidget *mainWindow, KActionCollectio
connect(mViewer, &MessageViewer::Viewer::showPreviousMessage, this, &KMReaderWin::showPreviousMessage);
mViewer->addMessageLoadedHandler(new MessageViewer::MarkMessageReadHandler(this));
mViewer->addMessageLoadedHandler(new MailCommon::SendMdnHandler(kmkernel, this));
// mViewer->addMessageLoadedHandler(new MailCommon::SendMdnHandler(kmkernel, this));
vlay->addWidget(mViewer);
readConfig();
......
Supports Markdown
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