summaryrefslogtreecommitdiffstats
path: root/framework/src/domain/mime/mimetreeparser/multipartsigned.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'framework/src/domain/mime/mimetreeparser/multipartsigned.cpp')
-rw-r--r--framework/src/domain/mime/mimetreeparser/multipartsigned.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/multipartsigned.cpp b/framework/src/domain/mime/mimetreeparser/multipartsigned.cpp
index 5c00e7dc..b511afce 100644
--- a/framework/src/domain/mime/mimetreeparser/multipartsigned.cpp
+++ b/framework/src/domain/mime/mimetreeparser/multipartsigned.cpp
@@ -24,8 +24,6 @@
24 24
25#include <KMime/Content> 25#include <KMime/Content>
26 26
27#include <QGpgME/Protocol>
28
29#include "mimetreeparser_debug.h" 27#include "mimetreeparser_debug.h"
30 28
31#include <QTextCodec> 29#include <QTextCodec>
@@ -67,16 +65,16 @@ MessagePart::Ptr MultiPartSignedBodyPartFormatter::process(Interface::BodyPart &
67 protocolContentType = signatureContentType; 65 protocolContentType = signatureContentType;
68 } 66 }
69 67
70 GpgME::Protocol protocol = GpgME::UnknownProtocol; 68 CryptoProtocol protocol = UnknownProtocol;
71 if (protocolContentType == QLatin1String("application/pkcs7-signature") || 69 if (protocolContentType == QLatin1String("application/pkcs7-signature") ||
72 protocolContentType == QLatin1String("application/x-pkcs7-signature")) { 70 protocolContentType == QLatin1String("application/x-pkcs7-signature")) {
73 protocol = GpgME::CMS; 71 protocol = CMS;
74 } else if (protocolContentType == QLatin1String("application/pgp-signature") || 72 } else if (protocolContentType == QLatin1String("application/pgp-signature") ||
75 protocolContentType == QLatin1String("application/x-pgp-signature")) { 73 protocolContentType == QLatin1String("application/x-pgp-signature")) {
76 protocol = GpgME::OpenPGP; 74 protocol = OpenPGP;
77 } 75 }
78 76
79 if (protocol == GpgME::UnknownProtocol) { 77 if (protocol == UnknownProtocol) {
80 return MessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), signedData, false)); 78 return MessagePart::Ptr(new MimeMessagePart(part.objectTreeParser(), signedData, false));
81 } 79 }
82 80