diff options
author | Sandro Knauß <sknauss@kde.org> | 2016-11-07 22:08:53 +0100 |
---|---|---|
committer | Sandro Knauß <sknauss@kde.org> | 2016-11-07 22:08:53 +0100 |
commit | 9c84f58fbfed435074416b5e6b884f757993722e (patch) | |
tree | 1754d060fe1b31228828f56b2aaf0cda3c18f9ed | |
parent | b2f4456792744b5f69d8b239141049bed25d8d6a (diff) | |
download | kube-9c84f58fbfed435074416b5e6b884f757993722e.tar.gz kube-9c84f58fbfed435074416b5e6b884f757993722e.zip |
build with gpgme instead of libkleo
-rw-r--r-- | framework/CMakeLists.txt | 2 | ||||
-rw-r--r-- | framework/domain/mimetreeparser/interface.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt index 95be342d..c2711c20 100644 --- a/framework/CMakeLists.txt +++ b/framework/CMakeLists.txt | |||
@@ -20,7 +20,7 @@ find_package(KF5MimeTreeParser "5.1.46" CONFIG REQUIRED) | |||
20 | find_package(KF5Mime "4.87.0" CONFIG REQUIRED) | 20 | find_package(KF5Mime "4.87.0" CONFIG REQUIRED) |
21 | find_package(Sink CONFIG REQUIRED) | 21 | find_package(Sink CONFIG REQUIRED) |
22 | find_package(KF5Async CONFIG REQUIRED) | 22 | find_package(KF5Async CONFIG REQUIRED) |
23 | find_package(KF5Libkleo CONFIG REQUIRED) | 23 | find_package(QGpgme CONFIG REQUIRED) |
24 | find_package(KF5IconThemes CONFIG REQUIRED) | 24 | find_package(KF5IconThemes CONFIG REQUIRED) |
25 | find_package(KF5Codecs CONFIG REQUIRED) | 25 | find_package(KF5Codecs CONFIG REQUIRED) |
26 | 26 | ||
diff --git a/framework/domain/mimetreeparser/interface.cpp b/framework/domain/mimetreeparser/interface.cpp index 0bcbfec4..7e9497c0 100644 --- a/framework/domain/mimetreeparser/interface.cpp +++ b/framework/domain/mimetreeparser/interface.cpp | |||
@@ -23,7 +23,8 @@ | |||
23 | #include "stringhtmlwriter.h" | 23 | #include "stringhtmlwriter.h" |
24 | #include "objecttreesource.h" | 24 | #include "objecttreesource.h" |
25 | 25 | ||
26 | #include <Libkleo/KeyListJob> | 26 | #include <QGpgME/KeyListJob> |
27 | #include <QGpgME/Protocol> | ||
27 | #include <gpgme++/key.h> | 28 | #include <gpgme++/key.h> |
28 | #include <gpgme++/keylistresult.h> | 29 | #include <gpgme++/keylistresult.h> |
29 | 30 | ||
@@ -366,7 +367,7 @@ void PartPrivate::appendSubPart(Part::Ptr subpart) | |||
366 | 367 | ||
367 | Encryption::Ptr PartPrivate::createEncryption(const MimeTreeParser::EncryptedMessagePart::Ptr& part) | 368 | Encryption::Ptr PartPrivate::createEncryption(const MimeTreeParser::EncryptedMessagePart::Ptr& part) |
368 | { | 369 | { |
369 | Kleo::KeyListJob *job = part->mCryptoProto->keyListJob(false); // local, no sigs | 370 | QGpgME::KeyListJob *job = part->mCryptoProto->keyListJob(false); // local, no sigs |
370 | if (!job) { | 371 | if (!job) { |
371 | qWarning() << "The Crypto backend does not support listing keys. "; | 372 | qWarning() << "The Crypto backend does not support listing keys. "; |
372 | return Encryption::Ptr(); | 373 | return Encryption::Ptr(); |
@@ -411,7 +412,7 @@ void PartPrivate::setEncryptions(const QVector< Encryption::Ptr >& encs) | |||
411 | QVector<Signature::Ptr> PartPrivate::createSignature(const MimeTreeParser::SignedMessagePart::Ptr& part) | 412 | QVector<Signature::Ptr> PartPrivate::createSignature(const MimeTreeParser::SignedMessagePart::Ptr& part) |
412 | { | 413 | { |
413 | QVector<Signature::Ptr> sigs; | 414 | QVector<Signature::Ptr> sigs; |
414 | Kleo::KeyListJob *job = part->mCryptoProto->keyListJob(false); // local, no sigs | 415 | QGpgME::KeyListJob *job = part->mCryptoProto->keyListJob(false); // local, no sigs |
415 | if (!job) { | 416 | if (!job) { |
416 | qWarning() << "The Crypto backend does not support listing keys. "; | 417 | qWarning() << "The Crypto backend does not support listing keys. "; |
417 | return sigs; | 418 | return sigs; |