From 9c84f58fbfed435074416b5e6b884f757993722e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20Knau=C3=9F?= <sknauss@kde.org>
Date: Mon, 7 Nov 2016 22:08:53 +0100
Subject: build with gpgme instead of libkleo

---
 framework/CMakeLists.txt                      | 2 +-
 framework/domain/mimetreeparser/interface.cpp | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'framework')

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)
 find_package(KF5Mime "4.87.0" CONFIG REQUIRED)
 find_package(Sink CONFIG REQUIRED)
 find_package(KF5Async CONFIG REQUIRED)
-find_package(KF5Libkleo CONFIG REQUIRED)
+find_package(QGpgme CONFIG REQUIRED)
 find_package(KF5IconThemes CONFIG REQUIRED)
 find_package(KF5Codecs CONFIG REQUIRED)
 
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 @@
 #include "stringhtmlwriter.h"
 #include "objecttreesource.h"
 
-#include <Libkleo/KeyListJob>
+#include <QGpgME/KeyListJob>
+#include <QGpgME/Protocol>
 #include <gpgme++/key.h>
 #include <gpgme++/keylistresult.h>
 
@@ -366,7 +367,7 @@ void PartPrivate::appendSubPart(Part::Ptr subpart)
 
 Encryption::Ptr PartPrivate::createEncryption(const MimeTreeParser::EncryptedMessagePart::Ptr& part)
 {
-    Kleo::KeyListJob *job = part->mCryptoProto->keyListJob(false);    // local, no sigs
+    QGpgME::KeyListJob *job = part->mCryptoProto->keyListJob(false);    // local, no sigs
     if (!job) {
         qWarning() << "The Crypto backend does not support listing keys. ";
         return Encryption::Ptr();
@@ -411,7 +412,7 @@ void PartPrivate::setEncryptions(const QVector< Encryption::Ptr >& encs)
 QVector<Signature::Ptr> PartPrivate::createSignature(const MimeTreeParser::SignedMessagePart::Ptr& part)
 {
     QVector<Signature::Ptr> sigs;
-    Kleo::KeyListJob *job = part->mCryptoProto->keyListJob(false);    // local, no sigs
+    QGpgME::KeyListJob *job = part->mCryptoProto->keyListJob(false);    // local, no sigs
     if (!job) {
         qWarning() << "The Crypto backend does not support listing keys. ";
         return sigs;
-- 
cgit v1.2.3