From 403035b48d97b825c3a147671e3abae405cf70a8 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 31 Jan 2020 08:17:58 +0100 Subject: [PATCH] dkim support is enabled by default now --- CMakeLists.txt | 2 +- src/kmail_part.cpp | 3 --- src/kmmainwidget.cpp | 7 ------- src/kmmainwidget.h | 5 ----- src/kmmainwin.cpp | 2 -- src/kmreadermainwin.cpp | 7 ------- src/kmreaderwin.cpp | 3 --- src/kmreaderwin.h | 5 ----- 8 files changed, 1 insertion(+), 33 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ab810dc8a..ac0ad438f 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.55") +set(MESSAGELIB_LIB_VERSION_LIB "5.13.56") set(LIBKLEO_LIB_VERSION_LIB "5.13.40") set(PIMCOMMON_LIB_VERSION_LIB "5.13.43") set(LIBKDEPIM_LIB_VERSION_LIB "5.13.40") diff --git a/src/kmail_part.cpp b/src/kmail_part.cpp index db8517aae..4ad0ba0a3 100644 --- a/src/kmail_part.cpp +++ b/src/kmail_part.cpp @@ -46,7 +46,6 @@ #include "foldershortcutactionmanager.h" #include "kmmigrateapplication.h" #include -#include "messageviewer/config-messageviewer.h" #include K_PLUGIN_FACTORY(KMailFactory, registerPlugin(); @@ -93,9 +92,7 @@ KMailPart::KMailPart(QWidget *parentWidget, QObject *parent, const QVariantList KParts::StatusBarExtension *statusBar = new KParts::StatusBarExtension(this); statusBar->addStatusBarItem(mainWidget->vacationScriptIndicator(), 2, false); statusBar->addStatusBarItem(mainWidget->zoomLabelIndicator(), 3, false); -#ifdef USE_DKIM_CHECKER statusBar->addStatusBarItem(mainWidget->dkimWidgetInfo(), 4, false); -#endif setXMLFile(QStringLiteral("kmail_part.rc"), true); KSettings::Dispatcher::registerComponent(QStringLiteral("kmail2"), mKMailKernel, "slotConfigChanged"); diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp index 261518a5c..090c56f8d 100644 --- a/src/kmmainwidget.cpp +++ b/src/kmmainwidget.cpp @@ -191,10 +191,8 @@ #include #include -#ifdef USE_DKIM_CHECKER #include #include -#endif using namespace KMime; using namespace Akonadi; @@ -337,7 +335,6 @@ KMMainWidget::KMMainWidget(QWidget *parent, KXMLGUIClient *aGUIClient, KActionCo setupUnifiedMailboxChecker(); } -#ifdef USE_DKIM_CHECKER QWidget *KMMainWidget::dkimWidgetInfo() const { if (mMsgView) { @@ -346,8 +343,6 @@ QWidget *KMMainWidget::dkimWidgetInfo() const return nullptr; } -#endif - void KMMainWidget::restoreCollectionFolderViewConfig() { ETMViewStateSaver *saver = new ETMViewStateSaver; @@ -2800,12 +2795,10 @@ 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/kmmainwidget.h b/src/kmmainwidget.h index ac2ddb5fc..b65ccdaa0 100644 --- a/src/kmmainwidget.h +++ b/src/kmmainwidget.h @@ -31,7 +31,6 @@ #include "messageactions.h" #include #include -#include "messageviewer/config-messageviewer.h" #include #include #include @@ -83,11 +82,9 @@ class SieveImapPasswordProvider; class ManageSieveScriptsDialog; class VacationManager; } -#ifdef USE_DKIM_CHECKER namespace MessageViewer { class DKIMWidgetInfo; } -#endif namespace MailCommon { class FolderSelectionDialog; class FavoriteCollectionWidget; @@ -144,9 +141,7 @@ public: static const PtrList *mainWidgetList(); QWidget *vacationScriptIndicator() const; -#ifdef USE_DKIM_CHECKER QWidget *dkimWidgetInfo() const; -#endif MailCommon::FolderTreeView *folderTreeView() const; /** Returns the XML GUI client. */ diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp index a5118402a..574d2ed27 100644 --- a/src/kmmainwin.cpp +++ b/src/kmmainwin.cpp @@ -177,9 +177,7 @@ void KMMainWin::setupStatusBar() statusBar()->addWidget(mMessageLabel); QTimer::singleShot(2000, KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::reset); -#ifdef USE_DKIM_CHECKER statusBar()->addPermanentWidget(mKMMainWidget->dkimWidgetInfo()); -#endif statusBar()->addPermanentWidget(mKMMainWidget->zoomLabelIndicator()); statusBar()->addPermanentWidget(mKMMainWidget->vacationScriptIndicator()); statusBar()->addPermanentWidget(mProgressBar->littleProgress()); diff --git a/src/kmreadermainwin.cpp b/src/kmreadermainwin.cpp index e2899ce36..dc967be75 100644 --- a/src/kmreadermainwin.cpp +++ b/src/kmreadermainwin.cpp @@ -69,11 +69,8 @@ #include #include "kpimtextedit/texttospeech.h" #include -#include "messageviewer/config-messageviewer.h" -#ifdef USE_DKIM_CHECKER #include #include -#endif using namespace MailCommon; KMReaderMainWin::KMReaderMainWin(MessageViewer::Viewer::DisplayFormatMessage format, bool htmlLoadExtDefault, const QString &name) @@ -113,9 +110,7 @@ void KMReaderMainWin::initKMReaderMainWin() mZoomLabelIndicator = new ZoomLabelWidget(statusBar()); statusBar()->addPermanentWidget(mZoomLabelIndicator); setZoomChanged(mReaderWin->viewer()->webViewZoomFactor()); -#ifdef USE_DKIM_CHECKER statusBar()->addPermanentWidget(mReaderWin->viewer()->dkimWidgetInfo()); -#endif if (!mReaderWin->message().isValid()) { menuBar()->hide(); toolBar(QStringLiteral("mainToolBar"))->hide(); @@ -758,12 +753,10 @@ 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 edcd4ca72..3e9d396ac 100644 --- a/src/kmreaderwin.cpp +++ b/src/kmreaderwin.cpp @@ -597,14 +597,11 @@ KActionMenu *KMReaderWin::shareServiceUrlMenu() const return mViewer->shareServiceUrlMenu(); } -#ifdef USE_DKIM_CHECKER DKIMViewerMenu *KMReaderWin::dkimViewerMenu() { return mViewer->dkimViewerMenu(); } -#endif - QList KMReaderWin::viewerPluginActionList(ViewerPluginInterface::SpecificFeatureTypes features) { return mViewer->viewerPluginActionList(features); diff --git a/src/kmreaderwin.h b/src/kmreaderwin.h index 345177bce..8b737e3ab 100644 --- a/src/kmreaderwin.h +++ b/src/kmreaderwin.h @@ -29,16 +29,13 @@ #include #include #include -#include class KActionCollection; class QAction; class KToggleAction; class QMenu; namespace MessageViewer { class CSSHelper; -#ifdef USE_DKIM_CHECKER class DKIMViewerMenu; -#endif } namespace MimeTreeParser { @@ -172,9 +169,7 @@ public: Q_REQUIRED_RESULT bool mimePartTreeIsEmpty() const; KActionMenu *shareServiceUrlMenu() const; -#ifdef USE_DKIM_CHECKER MessageViewer::DKIMViewerMenu *dkimViewerMenu(); -#endif Q_REQUIRED_RESULT QList viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features); Q_REQUIRED_RESULT QList interceptorUrlActions(const WebEngineViewer::WebHitTestResult &result) const;