From 01ce259ba667e822f753412cb7a5dfc951254bbf Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Tue, 31 Dec 2019 18:05:24 +0100
Subject: [PATCH] Use new dkim menu

---
 CMakeLists.txt          |  2 +-
 src/kmmainwidget.cpp    |  7 +++++++
 src/kmreadermainwin.cpp |  9 ++++++++-
 src/kmreaderwin.cpp     |  7 +++++++
 src/kmreaderwin.h       | 14 ++++++++++----
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46f796445..b2e400cec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,7 +67,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widget
 set(LIBGRAVATAR_VERSION_LIB "5.13.40")
 set(MAILCOMMON_LIB_VERSION_LIB "5.13.40")
 set(KDEPIM_APPS_LIB_VERSION_LIB "5.13.40")
-set(MESSAGELIB_LIB_VERSION_LIB "5.13.44")
+set(MESSAGELIB_LIB_VERSION_LIB "5.13.49")
 set(LIBKLEO_LIB_VERSION_LIB "5.13.40")
 set(PIMCOMMON_LIB_VERSION_LIB "5.13.40")
 set(LIBKDEPIM_LIB_VERSION_LIB "5.13.40")
diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index bfb4cdb90..7efb01af6 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -193,6 +193,7 @@
 
 #ifdef USE_DKIM_CHECKER
 #include <MessageViewer/DKIMWidgetInfo>
+#include <MessageViewer/DKIMViewerMenu>
 #endif
 
 using namespace KMime;
@@ -2799,6 +2800,12 @@ void KMMainWidget::showMessagePopup(const Akonadi::Item &msg, const QUrl &url, c
         menu.addSeparator();
 
         if (mMsgView) {
+#ifdef USE_DKIM_CHECKER
+            if (mMsgView->dkimViewerMenu()) {
+                menu.addMenu(mMsgView->dkimViewerMenu()->menu());
+                menu.addSeparator();
+            }
+#endif
             menu.addActions(mMsgView->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedMessage));
             menu.addSeparator();
         }
diff --git a/src/kmreadermainwin.cpp b/src/kmreadermainwin.cpp
index 9c268f798..33f3ebd4b 100644
--- a/src/kmreadermainwin.cpp
+++ b/src/kmreadermainwin.cpp
@@ -72,6 +72,7 @@
 #include "messageviewer/config-messageviewer.h"
 #ifdef USE_DKIM_CHECKER
 #include <MessageViewer/DKIMWidgetInfo>
+#include <MessageViewer/DKIMViewerMenu>
 #endif
 using namespace MailCommon;
 
@@ -666,7 +667,7 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg, const QUrl &url
             menu->addAction(mReaderWin->copyURLAction());
             menu->addSeparator();
             menu->addAction(mReaderWin->shareServiceUrlMenu());
-            menu->addSeparator();
+            menu->addSeparator();            
             menu->addActions(mReaderWin->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedUrl));
             if (!imageUrl.isEmpty()) {
                 menu->addSeparator();
@@ -757,6 +758,12 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg, const QUrl &url
             menu->addAction(mReaderWin->saveAsAction());
             menu->addAction(mSaveAtmAction);
             if (msg.isValid()) {
+#ifdef USE_DKIM_CHECKER
+                if (mReaderWin->dkimViewerMenu()) {
+                    menu->addSeparator();
+                    menu->addMenu(mReaderWin->dkimViewerMenu()->menu());
+                }
+#endif
                 menu->addSeparator();
                 menu->addActions(mReaderWin->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedMessage));
             }
diff --git a/src/kmreaderwin.cpp b/src/kmreaderwin.cpp
index 1507210e9..0ac2dfb9f 100644
--- a/src/kmreaderwin.cpp
+++ b/src/kmreaderwin.cpp
@@ -597,6 +597,13 @@ KActionMenu *KMReaderWin::shareServiceUrlMenu() const
     return mViewer->shareServiceUrlMenu();
 }
 
+#ifdef USE_DKIM_CHECKER
+DKIMViewerMenu *KMReaderWin::dkimViewerMenu()
+{
+    return mViewer->dkimViewerMenu();
+}
+#endif
+
 QList<QAction *> KMReaderWin::viewerPluginActionList(ViewerPluginInterface::SpecificFeatureTypes features)
 {
     return mViewer->viewerPluginActionList(features);
diff --git a/src/kmreaderwin.h b/src/kmreaderwin.h
index ff3555925..dd78a1541 100644
--- a/src/kmreaderwin.h
+++ b/src/kmreaderwin.h
@@ -29,12 +29,16 @@
 #include <MimeTreeParser/BodyPart>
 #include <AkonadiCore/Item>
 #include <KContacts/Addressee>
+#include <messageviewer/config-messageviewer.h>
 class KActionCollection;
 class QAction;
 class KToggleAction;
 class QMenu;
 namespace MessageViewer {
 class CSSHelper;
+#ifdef USE_DKIM_CHECKER
+class DKIMViewerMenu;
+#endif
 }
 
 namespace MimeTreeParser {
@@ -121,7 +125,7 @@ public:
 
     void displayResourceOfflinePage();
 
-    bool isFixedFont() const;
+    Q_REQUIRED_RESULT bool isFixedFont() const;
     void setUseFixedFont(bool useFixedFont);
     MessageViewer::Viewer *viewer() const;
     KToggleAction *toggleFixFontAction() const;
@@ -161,14 +165,16 @@ public:
 
     MessageViewer::CSSHelper *cssHelper() const;
 
-    bool printSelectedText(bool preview);
+    Q_REQUIRED_RESULT bool printSelectedText(bool preview);
 
     void setContactItem(const Akonadi::Item &contact, const KContacts::Addressee &address);
     void clearContactItem();
 
-    bool mimePartTreeIsEmpty() const;
+    Q_REQUIRED_RESULT bool mimePartTreeIsEmpty() const;
     KActionMenu *shareServiceUrlMenu() const;
-
+#ifdef USE_DKIM_CHECKER
+    MessageViewer::DKIMViewerMenu *dkimViewerMenu();
+#endif
     Q_REQUIRED_RESULT QList<QAction *> viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features);
 
     Q_REQUIRED_RESULT QList<QAction *> interceptorUrlActions(const WebEngineViewer::WebHitTestResult &result) const;