[debian-edu-commits] r82169 - in branches/wheezy/debian-edu-config: debian share/debian-edu/networked-kde3/share/config

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-08-20 19:09:04 +0000 (Tue, 20 Aug 2013)
New Revision: 82169

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu/networked-kde3/share/config/kioslaverc
Log:
Fix KDE proxy settings.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-20 17:32:10 UTC (rev 82168)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-20 19:09:04 UTC (rev 82169)
@@ -1,3 +1,9 @@
+debian-edu-config (1.713~svn82XXX) UNRELEASED; urgency=low
+
+  * Fix KDE proxy settings.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 20 Aug 2013 21:06:57 +0200
+
 debian-edu-config (1.713) unstable; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/share/debian-edu/networked-kde3/share/config/kioslaverc
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu/networked-kde3/share/config/kioslaverc	2013-08-20 17:32:10 UTC (rev 82168)
+++ branches/wheezy/debian-edu-config/share/debian-edu/networked-kde3/share/config/kioslaverc	2013-08-20 19:09:04 UTC (rev 82169)
@@ -1,6 +1,15 @@
 # - Make Konqueror automatically detect proxy settings
 # - Force proxy use through kiosk
 ###########################################################
+ProxyUrlDisplayFlags=0
+
 [Proxy Settings][$i]
-ProxyType=3
-AuthMode=0
+
+NoProxyFor=
+Proxy Config Script=http://wpad/wpad.dat
+ProxyType=2
+ReversedException=false
+ftpProxy=
+httpProxy=
+httpsProxy=
+socksProxy=