From 4dcb69cf8118cc021ccfc6eb482aa7d4ec6fddfa Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Tue, 29 Oct 2019 08:18:06 +0100
Subject: [PATCH] We need to clear plugin actions too

---
 src/kmmainwidget.cpp | 5 +++++
 src/kmmainwidget.h   | 1 +
 src/kmmainwin.cpp    | 1 +
 3 files changed, 7 insertions(+)

diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index be7e21b35..ed8c6743d 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -4209,6 +4209,11 @@ void KMMainWidget::clearFilterActions()
     mFilterCommands.clear();
 }
 
+void KMMainWidget::clearPluginActions()
+{
+    //KMailPluginInterface::self()->clearPluginActions(QStringLiteral("kmail"), mGUIClient);
+}
+
 void KMMainWidget::initializePluginActions()
 {
     KMailPluginInterface::self()->initializePluginActions(QStringLiteral("kmail"), mGUIClient);
diff --git a/src/kmmainwidget.h b/src/kmmainwidget.h
index 852dade27..445aee1e3 100644
--- a/src/kmmainwidget.h
+++ b/src/kmmainwidget.h
@@ -186,6 +186,7 @@ public:
     QAction *akonadiStandardAction(Akonadi::StandardMailActionManager::Type type);
     QWidget *zoomLabelIndicator() const;
 
+    void clearPluginActions();
 public Q_SLOTS:
 
     /**
diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp
index 11f38d19d..1e4256c4d 100644
--- a/src/kmmainwin.cpp
+++ b/src/kmmainwin.cpp
@@ -157,6 +157,7 @@ void KMMainWin::slotUpdateGui()
     // remove dynamically created actions before editing
     mKMMainWidget->clearFilterActions();
     mKMMainWidget->tagActionManager()->clearActions();
+    mKMMainWidget->clearPluginActions();
 
     createGUI(QStringLiteral("kmmainwin.rc"));
     applyMainWindowSettings(KMKernel::self()->config()->group("Main Window"));