Attachment #365644 for bug #494712

Lines 28-34 Link Here

(-)kwalletd/backend/kwalletbackend.orig.cc (+2 lines)
28	#include <kcodecs.h>	28	#include <kcodecs.h>
29	#include <ksavefile.h>	29	#include <ksavefile.h>
30	#include <kstandarddirs.h>	30	#include <kstandarddirs.h>
		31	#ifdef HAVE_QGPGME
31	#include <gpgme++/key.h>	32	#include <gpgme++/key.h>
		33	#endif
32	#include <knotification.h>	34	#include <knotification.h>
33		35
34	#include <QtCore/QFile>	36	#include <QtCore/QFile>

Lines 49-55 Link Here

(-)kwalletd/kwalletd.orig.cpp (+2 lines)
49	#include <kpluginfactory.h>	49	#include <kpluginfactory.h>
50	#include <kpluginloader.h>	50	#include <kpluginloader.h>
51	#include <KNotification>	51	#include <KNotification>
		52	#ifdef HAVE_QGPGME
52	#include <gpgme++/key.h>	53	#include <gpgme++/key.h>
		54	#endif
53		55
54	#include <QtCore/QDir>	56	#include <QtCore/QDir>
55	#include <QTextDocument> // Qt::escape	57	#include <QTextDocument> // Qt::escape

Lines 20-26 Link Here

(-)kwalletd/kwalletwizard.orig.h (+2 lines)
20	#define KWALLETWIZARD_H	20	#define KWALLETWIZARD_H
21		21
22	#include <QWizard>	22	#include <QWizard>
		23	#ifdef HAVE_QGPGME
23	#include <gpgme++/key.h>	24	#include <gpgme++/key.h>
		25	#endif
24		26
25	class PageGpgKey;	27	class PageGpgKey;
26	class PagePassword;	28	class PagePassword;





	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"));

        }

        delete kpd;
    #ifdef HAVE_QGPGME
    }
    #endif

	if (reclose) {
		internalClose(w, handle, true);

Return to bug 494712

Lines 835-845 Link Here

(-)kwalletd/kwalletd.orig.cpp (+4 lines)
835		835
836	assert(w);	836	assert(w);
837		837
		838	#ifdef HAVE_QGPGME
838	if (w->cipherType() == KWallet::BACKEND_CIPHER_GPG) {	839	if (w->cipherType() == KWallet::BACKEND_CIPHER_GPG) {
839	QString keyID = w->gpgKey().shortKeyID();	840	QString keyID = w->gpgKey().shortKeyID();
840	assert(!keyID.isNull());	841	assert(!keyID.isNull());
841	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));	842	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));
842	} else {	843	} else {
		844	#endif
843	QPointer<KNewPasswordDialog> kpd = new KNewPasswordDialog();	845	QPointer<KNewPasswordDialog> kpd = new KNewPasswordDialog();
844	kpd->setPrompt(i18n("<qt>Please choose a new password for the wallet '<b>%1</b>'.</qt>", Qt::escape(wallet)));	846	kpd->setPrompt(i18n("<qt>Please choose a new password for the wallet '<b>%1</b>'.</qt>", Qt::escape(wallet)));
845	kpd->setCaption(i18n("KDE Wallet Service"));	847	kpd->setCaption(i18n("KDE Wallet Service"));
Lines 864-870 Link Here
864	}	866	}
865		867
866	delete kpd;	868	delete kpd;
		869	#ifdef HAVE_QGPGME
867	}	870	}
		871	#endif
868		872
869	if (reclose) {	873	if (reclose) {
870	internalClose(w, handle, true);	874	internalClose(w, handle, true);