From d4bc52ae8ffd5d541e4524d5d984e0151b5e5536 Mon Sep 17 00:00:00 2001
From: Montel Laurent <montel@kde.org>
Date: Tue, 24 Oct 2017 13:35:14 +0200
Subject: [PATCH] Display a warning when mailtransport was removed

---
 CMakeLists.txt               | 2 +-
 src/editor/kmcomposerwin.cpp | 9 +++++++++
 src/editor/kmcomposerwin.h   | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 148600a06..bbc1de1d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ set(KCALENDARCORE_LIB_VERSION "5.6.40")
 set(CALENDARUTILS_LIB_VERSION "5.6.40")
 set(IDENTITYMANAGEMENT_LIB_VERSION "5.6.41")
 set(KLDAP_LIB_VERSION "5.6.40")
-set(KMAILTRANSPORT_LIB_VERSION "5.6.42")
+set(KMAILTRANSPORT_LIB_VERSION "5.6.43")
 set(KONTACTINTERFACE_LIB_VERSION "5.6.40")
 set(KMIME_LIB_VERSION "5.6.40")
 set(KPIMTEXTEDIT_LIB_VERSION "5.6.40")
diff --git a/src/editor/kmcomposerwin.cpp b/src/editor/kmcomposerwin.cpp
index 4b24d821a..73e227394 100644
--- a/src/editor/kmcomposerwin.cpp
+++ b/src/editor/kmcomposerwin.cpp
@@ -334,6 +334,7 @@ KMComposerWin::KMComposerWin(const KMime::Message::Ptr &aMsg, bool lastSignState
     transport->setToolTip(i18n("Select the outgoing account to use for sending this message"));
     mComposerBase->setTransportCombo(transport);
     connect(transport, QOverload<int>::of(&MailTransport::TransportComboBox::activated), this, &KMComposerWin::slotTransportChanged);
+    connect(transport, &MailTransport::TransportComboBox::transportRemoved, this, &KMComposerWin::slotTransportRemoved);
     mEdtFrom = new MessageComposer::ComposerLineEdit(false, mHeadersArea);
     mEdtFrom->setObjectName(QStringLiteral("fromLine"));
     mEdtFrom->setRecentAddressConfig(MessageComposer::MessageComposerSettings::self()->config());
@@ -3480,3 +3481,11 @@ void KMComposerWin::slotIdentityDeleted(uint uoid)
         mIncorrectIdentityFolderWarning->identityInvalid();
     }
 }
+
+void KMComposerWin::slotTransportRemoved(int id, const QString &name)
+{
+    Q_UNUSED(name);
+    if (mComposerBase->transportComboBox()->currentTransportId() == id) {
+        mIncorrectIdentityFolderWarning->mailTransportIsInvalid();
+    }
+}
diff --git a/src/editor/kmcomposerwin.h b/src/editor/kmcomposerwin.h
index 0c3c0d2e3..e86a4e5ab 100644
--- a/src/editor/kmcomposerwin.h
+++ b/src/editor/kmcomposerwin.h
@@ -535,6 +535,7 @@ private:
     void slotCryptoModuleSelected();
     void slotFccIsInvalid();
     void slotIdentityDeleted(uint uoid);
+    void slotTransportRemoved(int id, const QString &name);
 
     void updateComposerAfterIdentityChanged(const KIdentityManagement::Identity &ident, uint uoid, bool wasModified);