Commit 9fe8b9d1 authored by Laurent Montel's avatar Laurent Montel 😁 Committed by Pali Rohár

Look at to reactivate it. Not really possible yet

parent 314df641
......@@ -17,7 +17,7 @@ ki18n_wrap_ui(kopete_cryptography_PART_SRCS kabckeyselectorbase.ui exportkeysbas
add_library(kopete_cryptography MODULE ${kopete_cryptography_PART_SRCS})
target_link_libraries(kopete_cryptography Qt5::Gui KF5::KDELibs4Support kopete QGpgme )
target_link_libraries(kopete_cryptography Qt5::Gui KF5::KDELibs4Support kopete Gpgmepp )
install(TARGETS kopete_cryptography DESTINATION ${KDE_INSTALL_PLUGINDIR})
......
......@@ -42,15 +42,15 @@
#include "kabcpersistence.h"
// crypto stuff
#include <kleo/cryptobackendfactory.h>
#include <kleo/decryptverifyjob.h>
#include <kleo/decryptjob.h>
#include <kleo/verifyopaquejob.h>
#include <kleo/encryptjob.h>
#include <kleo/signencryptjob.h>
#include <kleo/signjob.h>
#include <kleo/keylistjob.h>
#include <kleo/job.h>
//#include <qgpgme/cryptobackendfactory.h>
#include <qgpgme/decryptverifyjob.h>
#include <qgpgme/decryptjob.h>
#include <qgpgme/verifyopaquejob.h>
#include <qgpgme/encryptjob.h>
#include <qgpgme/signencryptjob.h>
#include <qgpgme/signjob.h>
#include <qgpgme/keylistjob.h>
#include <qgpgme/job.h>
#include <gpgme++/decryptionresult.h>
#include <gpgme++/verificationresult.h>
#include <gpgme++/keylistresult.h>
......@@ -59,7 +59,7 @@
#include <gpgme++/key.h>
// kabc stuff
#include <kabc/addressbook.h>
//#include <kabc/addressbook.h>
// our own stuff
#include "cryptographyselectuserkey.h"
......@@ -385,7 +385,7 @@ void CryptographyPlugin::slotNewKMM(Kopete::ChatSession *KMM)
QStringList CryptographyPlugin::getKabcKeys(QString uid)
{
KABC::Addressee addressee = Kopete::KABCPersistence::self()->addressBook()->findByUid(uid);
KContacts::Addressee addressee = Kopete::KABCPersistence::self()->addressBook()->findByUid(uid);
QStringList keys;
// each 'if' block here is one way of getting a key.
......@@ -396,8 +396,8 @@ QStringList CryptographyPlugin::getKabcKeys(QString uid)
}
// this is the standard key field in Addressee, (which no app seems to use, but here it is anyways)
if (!(addressee.key(KABC::Key::PGP).textData()).isEmpty()) {
keys << addressee.key(KABC::Key::PGP).textData();
if (!(addressee.key(KContacts::Key::PGP).textData()).isEmpty()) {
keys << addressee.key(KContacts::Key::PGP).textData();
}
// remove duplicates
......
......@@ -16,8 +16,7 @@
*/
#include "exportkeys.h"
#include <kabc/addressee.h>
#include <kabc/addressbook.h>
#include <KContacts/Addressee>
#include <kiconloader.h>
#include <QPushButton>
......@@ -43,7 +42,7 @@ ExportKeys::ExportKeys (QList<Kopete::MetaContact *> mcs, QWidget *parent)
connect(this, SIGNAL(user1Clicked()), this, SLOT(accept()));
QString key;
KABC::Addressee addressee;
KContacts::Addressee addressee;
// this loop creates the list widget items
foreach (Kopete::MetaContact *mc, mcs) {
// see if there is a key. if not, go to top of loop and start again with a new metacontact
......@@ -85,7 +84,7 @@ ExportKeys::~ExportKeys()
void ExportKeys::accept()
{
KABC::AddressBook *ab = Kopete::KABCPersistence::self()->addressBook();
KContacts::AddressBook *ab = Kopete::KABCPersistence::self()->addressBook();
// add addressees to address book
for (int i = 0; i < mUi->keyList->count(); i++) {
......
......@@ -19,7 +19,7 @@
#include <kdialog.h>
#include <kabc/addresseelist.h>
#include <KContacts/AddresseeList>
namespace Kopete {
class MetaContact;
......@@ -46,7 +46,7 @@ protected slots:
private:
Ui::ExportKeysUI *mUi;
KABC::AddresseeList mAddressees;
KContacts::AddresseeList mAddressees;
QList<Kopete::MetaContact *> mMetaContacts;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment