diff options
Diffstat (limited to 'framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp')
-rw-r--r-- | framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp b/framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp index cac9853d..5316a6a7 100644 --- a/framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp +++ b/framework/src/domain/mime/mimetreeparser/multipartencrypted.cpp | |||
@@ -26,8 +26,6 @@ | |||
26 | 26 | ||
27 | #include <KMime/Content> | 27 | #include <KMime/Content> |
28 | 28 | ||
29 | #include <QGpgME/Protocol> | ||
30 | |||
31 | #include "mimetreeparser_debug.h" | 29 | #include "mimetreeparser_debug.h" |
32 | 30 | ||
33 | using namespace MimeTreeParser; | 31 | using namespace MimeTreeParser; |
@@ -51,19 +49,19 @@ MessagePart::Ptr MultiPartEncryptedBodyPartFormatter::process(Interface::BodyPar | |||
51 | return MessagePart::Ptr(); | 49 | return MessagePart::Ptr(); |
52 | } | 50 | } |
53 | 51 | ||
54 | const QGpgME::Protocol *useThisCryptProto = nullptr; | 52 | GpgME::Protocol useThisCryptProto = GpgME::UnknownProtocol; |
55 | 53 | ||
56 | /* | 54 | /* |
57 | ATTENTION: This code is to be replaced by the new 'auto-detect' feature. -------------------------------------- | 55 | ATTENTION: This code is to be replaced by the new 'auto-detect' feature. -------------------------------------- |
58 | */ | 56 | */ |
59 | KMime::Content *data = findTypeInDirectChilds(node, "application/octet-stream"); | 57 | KMime::Content *data = findTypeInDirectChilds(node, "application/octet-stream"); |
60 | if (data) { | 58 | if (data) { |
61 | useThisCryptProto = QGpgME::openpgp(); | 59 | useThisCryptProto = GpgME::OpenPGP; |
62 | } | 60 | } |
63 | if (!data) { | 61 | if (!data) { |
64 | data = findTypeInDirectChilds(node, "application/pkcs7-mime"); | 62 | data = findTypeInDirectChilds(node, "application/pkcs7-mime"); |
65 | if (data) { | 63 | if (data) { |
66 | useThisCryptProto = QGpgME::smime(); | 64 | useThisCryptProto = GpgME::CMS; |
67 | } | 65 | } |
68 | } | 66 | } |
69 | /* | 67 | /* |