summaryrefslogtreecommitdiff
path: root/src/rekonq.kcfg
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-03-26 19:10:39 +0200
committerAndrea Diamantini <adjam7@gmail.com>2012-04-12 02:30:01 +0200
commit3f9a13565557c57f74441442520ab02626c8c3da (patch)
tree882aac9209f4393650bd055755bce6ce5f1d604e /src/rekonq.kcfg
parentConsider new PasswordSavingEnabled privacy check (diff)
downloadrekonq-3f9a13565557c57f74441442520ab02626c8c3da.tar.xz
clean up failed rebasing and implement history timed expire check
Diffstat (limited to 'src/rekonq.kcfg')
-rw-r--r--src/rekonq.kcfg71
1 files changed, 20 insertions, 51 deletions
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 89d3b742..1fb3c1c4 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -39,6 +39,24 @@
<entry name="checkDefaultSearchEngine" type="Bool">
<default>true</default>
</entry>
+ <entry name="clearHistory" type="Bool">
+ <default>true</default>
+ </entry>
+ <entry name="clearDownloads" type="Bool">
+ <default>true</default>
+ </entry>
+ <entry name="clearCookies" type="Bool">
+ <default>true</default>
+ </entry>
+ <entry name="clearCachedPages" type="Bool">
+ <default>true</default>
+ </entry>
+ <entry name="clearWebIcons" type="Bool">
+ <default>true</default>
+ </entry>
+ <entry name="clearHomePageThumbs" type="Bool">
+ <default>true</default>
+ </entry>
</group>
@@ -164,24 +182,9 @@
<default>false</default>
</entry>
<entry name="expireHistory" type="Int">
- <default>1</default>
- </entry>
- <entry name="clearHistory" type="Bool">
- <default>true</default>
- </entry>
- <entry name="clearDownloads" type="Bool">
- <default>true</default>
- </entry>
- <entry name="clearCookies" type="Bool">
- <default>true</default>
- </entry>
- <entry name="clearCachedPages" type="Bool">
- <default>true</default>
- </entry>
- <entry name="clearWebIcons" type="Bool">
- <default>true</default>
+ <default>0</default>
</entry>
- <entry name="clearHomePageThumbs" type="Bool">
+ <entry name="passwordSavingEnabled" type="Bool">
<default>true</default>
</entry>
</group>
@@ -229,17 +232,6 @@
</group>
-<!-- Privacy Settings -->
-<group name="Privacy">
- <entry name="historyMaintainingPeriod" type="Int">
- <default>0</default>
- </entry>
- <entry name="passwordSavingEnabled" type="Bool">
- <default>true</default>
- </entry>
-</group>
-
-
<!-- Advanced Settings -->
<group name="Advanced">
<entry name="hScrollWheelHistory" type="Bool">
@@ -262,29 +254,6 @@
</entry>
</group>
-
-<!-- AdBlock Settings -->
-<group name="AdBlock">
- <entry name="adBlockEnabled" type="Bool">
- <default>false</default>
- </entry>
- <entry name="hideAdsEnabled" type="Bool">
- <default>false</default>
- </entry>
- <entry name="subscriptionTitles" type="StringList">
- <default>EasyList</default>
- </entry>
- <entry name="subscriptionLocations" type="StringList">
- <default>https://easylist-downloads.adblockplus.org/easylist.txt</default>
- </entry>
- <entry name="lastUpdate" type="DateTime">
- <default code="true">QDateTime(QDate(2009,03,13))</default>
- </entry>
- <entry name="updateInterval" type="Int">
- <default>7</default>
- </entry>
-</group>
-
<!-- Sync Settings -->
<group name="Sync">