summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-02-14 17:07:42 +0000
committerOlivier Blin <oblin@mandriva.org>2005-02-14 17:07:42 +0000
commit72e41c87b82d7652d4a31302cb40df4606b6fb5c (patch)
tree969c55839076e8799a8216fff35afdab39238208
parentdb90d54abfd141e1047a853b1c074bd57e907f9a (diff)
downloaddrakx-backup-do-not-use-72e41c87b82d7652d4a31302cb40df4606b6fb5c.tar
drakx-backup-do-not-use-72e41c87b82d7652d4a31302cb40df4606b6fb5c.tar.gz
drakx-backup-do-not-use-72e41c87b82d7652d4a31302cb40df4606b6fb5c.tar.bz2
drakx-backup-do-not-use-72e41c87b82d7652d4a31302cb40df4606b6fb5c.tar.xz
drakx-backup-do-not-use-72e41c87b82d7652d4a31302cb40df4606b6fb5c.zip
proxy_configure: modify KDE proxy settings too
-rw-r--r--perl-install/network/network.pm15
1 files changed, 15 insertions, 0 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 996b6691c..14bb01f11 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -336,6 +336,21 @@ sub proxy_configure {
setExportedVarsInCsh("$::prefix/etc/profile.d/proxy.csh", $u, qw(http_proxy ftp_proxy));
chmod 0755, "$::prefix/etc/profile.d/proxy.csh";
+ #- KDE proxy settings
+ my $kde_config_file = "$::prefix/usr/share/config/kioslaverc";
+ update_gnomekderc($kde_config_file,
+ undef,
+ PersistentProxyConnection => "false"
+ );
+ update_gnomekderc($kde_config_file,
+ "Proxy Settings",
+ AuthMode => 0,
+ ProxyType => ($u->{http_proxy} || $u->{ftp_proxy}) ? 4 : 0,
+ ftpProxy => "ftp_proxy",
+ httpProxy => "http_proxy",
+ httpsProxy => "http_proxy"
+ );
+
#- Gnome proxy settings
if (-d "$::prefix/etc/gconf/2/") {
my $defaults_dir = "/etc/gconf/gconf.xml.local-defaults";