diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-05-14 01:24:35 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-05-14 01:24:55 +0200 |
| commit | 343a67e61ed6c85fc37a91cffa1926412cb097b7 (patch) | |
| tree | 52f9e86dffece69c7dfb5bfe54a7a086cdc3f2fe /src/settings | |
| parent | Merge commit 'refs/merge-requests/2256' of git://gitorious.org/rekonq/mainlin... (diff) | |
| parent | Move adblock rules conf file to appdata, to maintain central config file tiny (diff) | |
| download | rekonq-343a67e61ed6c85fc37a91cffa1926412cb097b7.tar.xz | |
Merge branch 'FixBlocks'
WARNING:
as we have a new adblock file, adblock will not work until
rekonq doesn't update subscriptions.
In some test installations, you can force rekonq doing it by removing
your $KDEHOME/share/config/rekonqrc file :)
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/adblockwidget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/settings/adblockwidget.cpp b/src/settings/adblockwidget.cpp index 59cb8a81..412f03d9 100644 --- a/src/settings/adblockwidget.cpp +++ b/src/settings/adblockwidget.cpp @@ -126,7 +126,7 @@ void AdBlockWidget::load() } // load local rules - KSharedConfig::Ptr config = KGlobal::config(); + KSharedConfig::Ptr config = KSharedConfig::openConfig("adblock", KConfig::SimpleConfig, "appdata"); KConfigGroup localGroup(config, "rules"); QStringList rules = localGroup.readEntry("local-rules" , QStringList()); foreach(const QString &rule, rules) @@ -138,7 +138,7 @@ void AdBlockWidget::load() void AdBlockWidget::loadRules(QTreeWidgetItem *item) { - KSharedConfig::Ptr config = KGlobal::config(); + KSharedConfig::Ptr config = KSharedConfig::openConfig("adblock", KConfig::SimpleConfig, "appdata"); KConfigGroup localGroup(config, "rules"); QString str = item->text(0) + "-rules"; @@ -157,7 +157,7 @@ void AdBlockWidget::save() int n; // local rules - KSharedConfig::Ptr config = KGlobal::config(); + KSharedConfig::Ptr config = KSharedConfig::openConfig("adblock", KConfig::SimpleConfig, "appdata"); KConfigGroup localGroup(config , "rules"); QStringList localRules; |