From cf6c1002e761afe7856ac6665e7e977801da1633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Mon, 19 Nov 2018 12:32:16 +0100
Subject: [PATCH] Make sure the unified mailbox dialog is only really shown
 once

Reviewers: mlaurent, dfaure

Reviewed By: dfaure

Subscribers: kde-pim

Tags: #kde_pim

Differential Revision: https://phabricator.kde.org/D17010
---
 src/kmmainwidget.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
index d62a78891..e1e82ce56 100644
--- a/src/kmmainwidget.cpp
+++ b/src/kmmainwidget.cpp
@@ -4825,6 +4825,8 @@ void KMMainWidget::setupUnifiedMailboxChecker()
                              return;
                          }
 
+                         KMailSettings::self()->setAskEnableUnifiedMailboxes(false);
+
                          const auto service = Akonadi::ServerManager::self()->agentServiceName(Akonadi::ServerManager::Agent, QStringLiteral("akonadi_unifiedmailbox_agent"));
                          QDBusInterface iface(service, QStringLiteral("/"), QStringLiteral("org.freedesktop.Akonadi.UnifiedMailboxAgent"),
                                               QDBusConnection::sessionBus(), this);
@@ -4847,8 +4849,6 @@ void KMMainWidget::setupUnifiedMailboxChecker()
                          if (answer == KMessageBox::Yes) {
                              iface.call(QStringLiteral("setEnableAgent"), true);
                          }
-
-                         KMailSettings::self()->setAskEnableUnifiedMailboxes(false);
                      };
 
     connect(kmkernel, &KMKernel::incomingAccountsChanged, this, ask);