[patch] kwalletd-4.12.0-qgpgme.patch

kwalletd-4.12.0-qgpgme.patch (text/plain), 1.96 KB, created by Alex Barker on 2013-12-19 04:54:05 UTC

--- kwalletd/backend/kwalletbackend.orig.cc	2013-12-18 20:22:59.722880177 -0800
+++ kwalletd/backend/kwalletbackend.cc	2013-12-18 20:22:05.784881266 -0800
@@ -28,7 +28,9 @@
 #include <kcodecs.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
+#ifdef HAVE_QGPGME
 #include <gpgme++/key.h>
+#endif
 #include <knotification.h>
 
 #include <QtCore/QFile>
--- kwalletd/kwalletd.orig.cpp	2013-12-18 20:28:33.313873443 -0800
+++ kwalletd/kwalletd.cpp	2013-12-18 20:28:23.555873640 -0800
@@ -49,7 +49,9 @@
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
 #include <KNotification>
+#ifdef HAVE_QGPGME
 #include <gpgme++/key.h>
+#endif
 
 #include <QtCore/QDir>
 #include <QTextDocument> // Qt::escape
--- kwalletd/kwalletwizard.orig.h	2013-12-18 20:32:16.403868940 -0800
+++ kwalletd/kwalletwizard.h	2013-12-18 20:32:54.993868161 -0800
@@ -20,7 +20,9 @@
 #define KWALLETWIZARD_H
 
 #include <QWizard>
+#ifdef HAVE_QGPGME
 #include <gpgme++/key.h>
+#endif
 
 class PageGpgKey;
 class PagePassword;
--- kwalletd/kwalletd.orig.cpp	2013-12-18 20:34:21.072866424 -0800
+++ kwalletd/kwalletd.cpp	2013-12-18 20:39:30.801860172 -0800
@@ -835,11 +835,13 @@
 
 	assert(w);
 
+    #ifdef HAVE_QGPGME
     if (w->cipherType() == KWallet::BACKEND_CIPHER_GPG) {
         QString keyID = w->gpgKey().shortKeyID();
         assert(!keyID.isNull());
         KMessageBox::errorWId((WId)wId, i18n("<qt>The <b>%1</b> wallet is encrypted using GPG key <b>%2</b>. Please use <b>GPG</b> tools (such as <b>kleopatra</b>) to change the passphrase associated to that key.</qt>", Qt::escape(wallet), keyID));
     } else {
+    #endif
         QPointer<KNewPasswordDialog> kpd = new KNewPasswordDialog();
         kpd->setPrompt(i18n("<qt>Please choose a new password for the wallet '<b>%1</b>'.</qt>", Qt::escape(wallet)));
         kpd->setCaption(i18n("KDE Wallet Service"));
@@ -864,7 +866,9 @@
         }
 
         delete kpd;
+    #ifdef HAVE_QGPGME
     }
+    #endif
 
 	if (reclose) {
 		internalClose(w, handle, true);