[SCM] kwallet packaging branch, master, updated. 9152ddaac84330fc04467ffb5fba760abb139d8a
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Feb 24 17:14:14 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwallet.git;a=commitdiff;h=98bd5db
The following commit has been merged in the master branch:
commit 98bd5dbc40292cc0aabce1780d25b5d9ec94ee29
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Jan 28 19:38:06 2015 +0100
Remove unused patches
---
debian/patches/series | 0
debian/patches/upstream_default-choice.diff | 27 ------
debian/patches/upstream_first-use-logic.diff | 126 -------------------------
debian/patches/upstream_first-use-name.diff | 134 ---------------------------
4 files changed, 287 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/patches/upstream_default-choice.diff b/debian/patches/upstream_default-choice.diff
deleted file mode 100644
index ba8b2dc..0000000
--- a/debian/patches/upstream_default-choice.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Valentin Rusu <kde at rusu.info>
-Date: Mon, 07 Jul 2014 21:03:31 +0000
-Subject: Give the default choice to use the kwallet system
-X-Git-Url: http://quickgit.kde.org/?p=kwallet.git&a=commitdiff&h=e688c99a7217d80326417a96dd222c148df03067
-Bug: https://bugs.kde.org/show_bug.cgi?id=337177
----
-Give the default choice to use the kwallet system
-
-BUG: 337177
-
-Let the checkbox be initially checked. I'm sure several years ago
-asked this checkbox to be initially unchecked :-)
----
-
-
-Index: kwallet-kf5-5.0.0/src/runtime/kwalletd/kwalletwizard.cpp
-===================================================================
---- kwallet-kf5-5.0.0.orig/src/runtime/kwalletd/kwalletwizard.cpp
-+++ kwallet-kf5-5.0.0/src/runtime/kwalletd/kwalletwizard.cpp
-@@ -93,6 +93,7 @@ public:
- connect(ui._useWallet, SIGNAL(clicked()), parent, SLOT(passwordPageUpdate()));
- connect(ui._pass1, SIGNAL(textChanged(QString)), parent, SLOT(passwordPageUpdate()));
- connect(ui._pass2, SIGNAL(textChanged(QString)), parent, SLOT(passwordPageUpdate()));
-+ ui._useWallet->setChecked(true);
- }
-
- virtual int nextId() const
diff --git a/debian/patches/upstream_first-use-logic.diff b/debian/patches/upstream_first-use-logic.diff
deleted file mode 100644
index 61cfb38..0000000
--- a/debian/patches/upstream_first-use-logic.diff
+++ /dev/null
@@ -1,126 +0,0 @@
-From: Valentin Rusu <kde at rusu.info>
-Date: Mon, 07 Jul 2014 22:53:51 +0000
-Subject: Remove the legacy first start logic
-X-Git-Url: http://quickgit.kde.org/?p=kwallet.git&a=commitdiff&h=9558c56a478a02cc9939264081d0b3fe6c6c0c82
----
-Remove the legacy first start logic
-
-BUG: 337171
-BUG: 337174
----
-
-
-Index: kwallet-kf5-5.0.0/src/runtime/kwalletd/kwalletd.cpp
-===================================================================
---- kwallet-kf5-5.0.0.orig/src/runtime/kwalletd/kwalletd.cpp
-+++ kwallet-kf5-5.0.0/src/runtime/kwalletd/kwalletd.cpp
-@@ -446,57 +446,58 @@ int KWalletD::doTransactionOpen(const QS
- KConfigGroup cfg(&kwalletrc, "Wallet");
- _firstUse = false;
- cfg.writeEntry("First Use", false);
-- } else {
-- // First use wizard
-- // TODO GPG adjust new smartcard options gathered by the wizard
-- QPointer<KWalletWizard> wiz = new KWalletWizard(0);
-- wiz->setWindowTitle(i18n("KDE Wallet Service"));
-- setupDialog(wiz, (WId)wId, appid, modal);
-- int rc = wiz->exec();
-- if (rc == QDialog::Accepted && wiz) {
-- bool useWallet = wiz->field("useWallet").toBool();
-- KConfig kwalletrc("kwalletrc");
-- KConfigGroup cfg(&kwalletrc, "Wallet");
-- cfg.writeEntry("First Use", false);
-- cfg.writeEntry("Enabled", useWallet);
-- cfg.writeEntry("Close When Idle", wiz->field("closeWhenIdle").toBool());
-- cfg.writeEntry("Use One Wallet", !wiz->field("networkWallet").toBool());
-- cfg.sync();
-- reconfigure();
--
-- if (!useWallet) {
-- delete wiz;
-- return -1;
-- }
--
-- // Create the wallet
-- // TODO GPG select the correct wallet type upon cretion (GPG or blowfish based)
-- KWallet::Backend *b = new KWallet::Backend(KWallet::Wallet::LocalWallet());
--#ifdef HAVE_QGPGME
-- if (wiz->field("useBlowfish").toBool()) {
-- b->setCipherType(KWallet::BACKEND_CIPHER_BLOWFISH);
--#endif
-- QString pass = wiz->field("pass1").toString();
-- QByteArray p(pass.toUtf8(), pass.length());
-- b->open(p);
-- p.fill(0);
--#ifdef HAVE_QGPGME
-- } else {
-- assert(wiz->field("useGpg").toBool());
-- b->setCipherType(KWallet::BACKEND_CIPHER_GPG);
-- b->open(wiz->gpgKey());
-- }
--#endif
-- b->createFolder(KWallet::Wallet::PasswordFolder());
-- b->createFolder(KWallet::Wallet::FormDataFolder());
-- b->close(true);
-- delete b;
-- delete wiz;
-- } else {
-- delete wiz;
-- return -1;
-- }
-- }
-+ }
-+// else {
-+// // First use wizard
-+// // TODO GPG adjust new smartcard options gathered by the wizard
-+// QPointer<KWalletWizard> wiz = new KWalletWizard(0);
-+// wiz->setWindowTitle(i18n("KDE Wallet Service"));
-+// setupDialog(wiz, (WId)wId, appid, modal);
-+// int rc = wiz->exec();
-+// if (rc == QDialog::Accepted && wiz) {
-+// bool useWallet = wiz->field("useWallet").toBool();
-+// KConfig kwalletrc("kwalletrc");
-+// KConfigGroup cfg(&kwalletrc, "Wallet");
-+// cfg.writeEntry("First Use", false);
-+// cfg.writeEntry("Enabled", useWallet);
-+// cfg.writeEntry("Close When Idle", wiz->field("closeWhenIdle").toBool());
-+// cfg.writeEntry("Use One Wallet", !wiz->field("networkWallet").toBool());
-+// cfg.sync();
-+// reconfigure();
-+//
-+// if (!useWallet) {
-+// delete wiz;
-+// return -1;
-+// }
-+//
-+// // Create the wallet
-+// // TODO GPG select the correct wallet type upon cretion (GPG or blowfish based)
-+// KWallet::Backend *b = new KWallet::Backend(KWallet::Wallet::LocalWallet());
-+// #ifdef HAVE_QGPGME
-+// if (wiz->field("useBlowfish").toBool()) {
-+// b->setCipherType(KWallet::BACKEND_CIPHER_BLOWFISH);
-+// #endif
-+// QString pass = wiz->field("pass1").toString();
-+// QByteArray p(pass.toUtf8(), pass.length());
-+// b->open(p);
-+// p.fill(0);
-+// #ifdef HAVE_QGPGME
-+// } else {
-+// assert(wiz->field("useGpg").toBool());
-+// b->setCipherType(KWallet::BACKEND_CIPHER_GPG);
-+// b->open(wiz->gpgKey());
-+// }
-+// #endif
-+// b->createFolder(KWallet::Wallet::PasswordFolder());
-+// b->createFolder(KWallet::Wallet::FormDataFolder());
-+// b->close(true);
-+// delete b;
-+// delete wiz;
-+// } else {
-+// delete wiz;
-+// return -1;
-+// }
-+// }
- }
-
- int rc = internalOpen(appid, wallet, isPath, WId(wId), modal, service);
diff --git a/debian/patches/upstream_first-use-name.diff b/debian/patches/upstream_first-use-name.diff
deleted file mode 100644
index 696ef6e..0000000
--- a/debian/patches/upstream_first-use-name.diff
+++ /dev/null
@@ -1,134 +0,0 @@
-From: Valentin Rusu <kde at rusu.info>
-Date: Mon, 07 Jul 2014 22:30:06 +0000
-Subject: Fix first use case, when user specifies a name for a new wallet
-X-Git-Url: http://quickgit.kde.org/?p=kwallet.git&a=commitdiff&h=25c7bb461d5821f332d43107a1cf2ba4c760bed3
----
-Fix first use case, when user specifies a name for a new wallet
-
-BUG: 337171
-
-The legacy logic always created a default wallet, with the default
-"kdewallet" name, the created the wallet the user requested.
-This commit will fix it, by using the user specified name as the
-default wallet name.
----
-
-
-Index: kwallet-kf5-5.0.0/src/runtime/kwalletd/kwalletd.cpp
-===================================================================
---- kwallet-kf5-5.0.0.orig/src/runtime/kwalletd/kwalletd.cpp
-+++ kwallet-kf5-5.0.0/src/runtime/kwalletd/kwalletd.cpp
-@@ -434,61 +434,69 @@ void KWalletD::checkActiveDialog()
- int KWalletD::doTransactionOpen(const QString &appid, const QString &wallet, bool isPath,
- qlonglong wId, bool modal, const QString &service)
- {
-- if (_firstUse && !wallets().contains(KWallet::Wallet::LocalWallet()) && !isPath) {
-- // First use wizard
-- // TODO GPG adjust new smartcard options gathered by the wizard
-- QPointer<KWalletWizard> wiz = new KWalletWizard(0);
-- wiz->setWindowTitle(i18n("KDE Wallet Service"));
-- setupDialog(wiz, (WId)wId, appid, modal);
-- int rc = wiz->exec();
-- if (rc == QDialog::Accepted && wiz) {
-- bool useWallet = wiz->field("useWallet").toBool();
-+ if (_firstUse && !isPath) {
-+ // if the user specifies a wallet name, the use it as the default wallet name
-+ if (wallet != KWallet::Wallet::LocalWallet()) {
- KConfig kwalletrc("kwalletrc");
- KConfigGroup cfg(&kwalletrc, "Wallet");
-+ cfg.writeEntry("Default Wallet", wallet);
-+ }
-+ if (wallets().contains(KWallet::Wallet::LocalWallet())) {
-+ KConfig kwalletrc("kwalletrc");
-+ KConfigGroup cfg(&kwalletrc, "Wallet");
-+ _firstUse = false;
- cfg.writeEntry("First Use", false);
-- cfg.writeEntry("Enabled", useWallet);
-- cfg.writeEntry("Close When Idle", wiz->field("closeWhenIdle").toBool());
-- cfg.writeEntry("Use One Wallet", !wiz->field("networkWallet").toBool());
-- cfg.sync();
-- reconfigure();
-+ } else {
-+ // First use wizard
-+ // TODO GPG adjust new smartcard options gathered by the wizard
-+ QPointer<KWalletWizard> wiz = new KWalletWizard(0);
-+ wiz->setWindowTitle(i18n("KDE Wallet Service"));
-+ setupDialog(wiz, (WId)wId, appid, modal);
-+ int rc = wiz->exec();
-+ if (rc == QDialog::Accepted && wiz) {
-+ bool useWallet = wiz->field("useWallet").toBool();
-+ KConfig kwalletrc("kwalletrc");
-+ KConfigGroup cfg(&kwalletrc, "Wallet");
-+ cfg.writeEntry("First Use", false);
-+ cfg.writeEntry("Enabled", useWallet);
-+ cfg.writeEntry("Close When Idle", wiz->field("closeWhenIdle").toBool());
-+ cfg.writeEntry("Use One Wallet", !wiz->field("networkWallet").toBool());
-+ cfg.sync();
-+ reconfigure();
-
-- if (!useWallet) {
-- delete wiz;
-- return -1;
-- }
-+ if (!useWallet) {
-+ delete wiz;
-+ return -1;
-+ }
-
-- // Create the wallet
-- // TODO GPG select the correct wallet type upon cretion (GPG or blowfish based)
-- KWallet::Backend *b = new KWallet::Backend(KWallet::Wallet::LocalWallet());
-+ // Create the wallet
-+ // TODO GPG select the correct wallet type upon cretion (GPG or blowfish based)
-+ KWallet::Backend *b = new KWallet::Backend(KWallet::Wallet::LocalWallet());
- #ifdef HAVE_QGPGME
-- if (wiz->field("useBlowfish").toBool()) {
-- b->setCipherType(KWallet::BACKEND_CIPHER_BLOWFISH);
-+ if (wiz->field("useBlowfish").toBool()) {
-+ b->setCipherType(KWallet::BACKEND_CIPHER_BLOWFISH);
- #endif
-- QString pass = wiz->field("pass1").toString();
-- QByteArray p(pass.toUtf8(), pass.length());
-- b->open(p);
-- p.fill(0);
-+ QString pass = wiz->field("pass1").toString();
-+ QByteArray p(pass.toUtf8(), pass.length());
-+ b->open(p);
-+ p.fill(0);
- #ifdef HAVE_QGPGME
-+ } else {
-+ assert(wiz->field("useGpg").toBool());
-+ b->setCipherType(KWallet::BACKEND_CIPHER_GPG);
-+ b->open(wiz->gpgKey());
-+ }
-+#endif
-+ b->createFolder(KWallet::Wallet::PasswordFolder());
-+ b->createFolder(KWallet::Wallet::FormDataFolder());
-+ b->close(true);
-+ delete b;
-+ delete wiz;
- } else {
-- assert(wiz->field("useGpg").toBool());
-- b->setCipherType(KWallet::BACKEND_CIPHER_GPG);
-- b->open(wiz->gpgKey());
-+ delete wiz;
-+ return -1;
- }
--#endif
-- b->createFolder(KWallet::Wallet::PasswordFolder());
-- b->createFolder(KWallet::Wallet::FormDataFolder());
-- b->close(true);
-- delete b;
-- delete wiz;
-- } else {
-- delete wiz;
-- return -1;
- }
-- } else if (_firstUse && !isPath) {
-- KConfig kwalletrc("kwalletrc");
-- KConfigGroup cfg(&kwalletrc, "Wallet");
-- _firstUse = false;
-- cfg.writeEntry("First Use", false);
- }
-
- int rc = internalOpen(appid, wallet, isPath, WId(wId), modal, service);
--
kwallet packaging
More information about the pkg-kde-commits
mailing list