From 55acce3807d7446321dd9f943a1ba2bf1fc89aa7 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Sun, 10 Dec 2017 21:20:14 +0100
Subject: Removed unreachable codepaths

---
 .../src/domain/mime/mimetreeparser/messagepart.cpp      | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/framework/src/domain/mime/mimetreeparser/messagepart.cpp b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
index 703cbba6..fb61e015 100644
--- a/framework/src/domain/mime/mimetreeparser/messagepart.cpp
+++ b/framework/src/domain/mime/mimetreeparser/messagepart.cpp
@@ -866,24 +866,11 @@ void SignedMessagePart::startVerificationDetached(const QByteArray &text, KMime:
         delete m;
     } else {
         QString errorMsg;
-        QString cryptPlugLibName;
-        QString cryptPlugDisplayName;
-        if (mCryptoProto) {
-            cryptPlugLibName = mCryptoProto->name();
-            cryptPlugDisplayName = mCryptoProto->displayName();
-        }
-
         if (!mCryptoProto) {
-            if (cryptPlugDisplayName.isEmpty()) {
-                errorMsg = tr("No appropriate crypto plug-in was found.");
-            } else {
-                errorMsg = tr("%1 is either 'OpenPGP' or 'S/MIME'",
-                                 "No %1 plug-in was found.").arg(
-                                 cryptPlugDisplayName);
-            }
+            errorMsg = tr("No appropriate crypto plug-in was found.");
         } else {
             errorMsg = tr("Crypto plug-in \"%1\" cannot verify signatures.").arg(
-                            cryptPlugLibName);
+                            mCryptoProto->name());
         }
         mMetaData.errorText = tr("The message is signed, but the "
                                    "validity of the signature cannot be "
-- 
cgit v1.2.3