summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBurkhard Lück <[email protected]>2016-08-11 15:04:34 +0200
committerBurkhard Lück <[email protected]>2016-08-11 15:04:34 +0200
commit0a7279fc0ebab9c8dbc94c6035751d0500aa342d (patch)
tree9f77d8a80593f0b7c35e40bcb6e0fe394a77c71b
parenta62b6227b285603c20b8dcebde6eb72d6510134d (diff)
Fix wrong path to existing wallet filesv16.08.0
the wallet files *.kwl + *.salt are located in a subdir "/kwalletd/" in QStandardPaths::GenericDataLocation see kwalletmanager.cpp:390: const QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/kwalletd/"; kwalletmanager.cpp:420: const QString destinationDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/kwalletd/"; But the code in konfigurator.cpp used QStandardPaths::DataLocation) + "/kwallet/" therefore existing wallet files were not found and the config entries "Auto Allow" and "Auto Deny" were always deleted With the patch the config entries "Auto Allow" and "Auto Deny" are preserved in kwalletrc REVIEW:128354 BUG:358469 BUG:363532
-rw-r--r--src/konfigurator/konfigurator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/konfigurator/konfigurator.cpp b/src/konfigurator/konfigurator.cpp
index e4fa19f..9ede708 100644
--- a/src/konfigurator/konfigurator.cpp
+++ b/src/konfigurator/konfigurator.cpp
@@ -228,8 +228,8 @@ void KWalletConfig::load()
QString walletName = *i;
// perform cleanup in the kwalletrc file, by removing entries that correspond to non-existent
// (previously deleted, for example) wallets
- QString path = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
- path.append(QString("/kwallet/%1.kwl").arg(walletName));
+ QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation);
+ path.append(QString("/kwalletd/%1.kwl").arg(walletName));
if (!QFile::exists(path)) {
// if the wallet no longer exists, delete the entries from the configuration file and skip to next entry
KConfigGroup cfgAllow = KSharedConfig::openConfig("kwalletrc")->group("Auto Allow");