From 62e0a9d46eb4cbabe9fad31903a63d31df9e8432 Mon Sep 17 00:00:00 2001
From: Dario Freddi <drf@kde.org>
Date: Tue, 13 Oct 2009 00:40:44 +0200
Subject: Remove rekonq's custom proxy implementation to use KDE's proxy
 settings through KProtocolManager. This makes rekonq much more integrated
 withing KDE, as the user expects that changes in System Settings would take
 place everywhere. And it also leaves less code to maintain

Signed-off-by: Dario Freddi <drf@kde.org>
---
 src/rekonq.kcfg | 19 -------------------
 1 file changed, 19 deletions(-)

(limited to 'src/rekonq.kcfg')

diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 0a63922f..9e854f76 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -75,25 +75,6 @@
         </entry>
     </group>
 
-<!-- Proxy Settings -->
-  <group name="Proxy">
-    <entry name="isProxyEnabled" type="Bool">
-        <default>false</default>
-    </entry>
-    <entry name="proxyType" type="Int">
-        <default>0</default>
-    </entry>
-    <entry name="proxyHostName" type="String">
-    </entry>
-    <entry name="proxyPort" type="Int">
-        <default>8080</default>
-    </entry>
-    <entry name="proxyUserName" type="String">
-    </entry>
-    <entry name="proxyPassword" type="Password">
-    </entry>
-  </group>
-
 <!-- WebKit Settings -->
     <group name="Webkit">
         <entry name="autoLoadImages" type="Bool">
-- 
cgit v1.2.1


From aa1193e1190ef8775ce13573f8ff57b8f876bdff Mon Sep 17 00:00:00 2001
From: Dario Freddi <drf@kde.org>
Date: Tue, 13 Oct 2009 00:50:53 +0200
Subject: Small fixes (const issue, single char issue, file not ending with a
 new line), and adding the correct schema to kconfigxt files

Signed-off-by: Dario Freddi <drf@kde.org>
---
 src/rekonq.kcfg | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/rekonq.kcfg')

diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 9e854f76..c55fce9c 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.dtd">
-<kcfg>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
 
 <!-- Includes -->
 <include>QtWebKit</include>
-- 
cgit v1.2.1