diff options
-rw-r--r-- | framework/src/domain/mime/mimetreeparser/messagepart.cpp | 17 |
1 files 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: | |||
866 | delete m; | 866 | delete m; |
867 | } else { | 867 | } else { |
868 | QString errorMsg; | 868 | QString errorMsg; |
869 | QString cryptPlugLibName; | ||
870 | QString cryptPlugDisplayName; | ||
871 | if (mCryptoProto) { | ||
872 | cryptPlugLibName = mCryptoProto->name(); | ||
873 | cryptPlugDisplayName = mCryptoProto->displayName(); | ||
874 | } | ||
875 | |||
876 | if (!mCryptoProto) { | 869 | if (!mCryptoProto) { |
877 | if (cryptPlugDisplayName.isEmpty()) { | 870 | errorMsg = tr("No appropriate crypto plug-in was found."); |
878 | errorMsg = tr("No appropriate crypto plug-in was found."); | ||
879 | } else { | ||
880 | errorMsg = tr("%1 is either 'OpenPGP' or 'S/MIME'", | ||
881 | "No %1 plug-in was found.").arg( | ||
882 | cryptPlugDisplayName); | ||
883 | } | ||
884 | } else { | 871 | } else { |
885 | errorMsg = tr("Crypto plug-in \"%1\" cannot verify signatures.").arg( | 872 | errorMsg = tr("Crypto plug-in \"%1\" cannot verify signatures.").arg( |
886 | cryptPlugLibName); | 873 | mCryptoProto->name()); |
887 | } | 874 | } |
888 | mMetaData.errorText = tr("The message is signed, but the " | 875 | mMetaData.errorText = tr("The message is signed, but the " |
889 | "validity of the signature cannot be " | 876 | "validity of the signature cannot be " |