summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-08-17 14:35:32 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-08-17 14:35:32 +0000
commiteaa1efda85f50259529c6038cc808df2e636da63 (patch)
treefcdde3074adf783e470533c2fbe0432e5c8888a1
parent242011a19029f260e65df6e1c0a00fe50f748bdd (diff)
downloaddrakx-net-eaa1efda85f50259529c6038cc808df2e636da63.tar
drakx-net-eaa1efda85f50259529c6038cc808df2e636da63.tar.gz
drakx-net-eaa1efda85f50259529c6038cc808df2e636da63.tar.bz2
drakx-net-eaa1efda85f50259529c6038cc808df2e636da63.tar.xz
drakx-net-eaa1efda85f50259529c6038cc808df2e636da63.zip
Showing netprofile info in proxies configuration when required.
-rw-r--r--lib/network/network.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/network/network.pm b/lib/network/network.pm
index 8161cbe..6dc90ed 100644
--- a/lib/network/network.pm
+++ b/lib/network/network.pm
@@ -532,9 +532,12 @@ sub advanced_choose {
sub miscellaneous_choose {
my ($in, $u) = @_;
+ my $net = {};
+ netprofile_read($net);
+
my $use_http_for_https = $u->{https_proxy} eq $u->{http_proxy};
$in->ask_from(N("Proxies configuration"),
- N("Here you can set up your proxies configuration (eg: http://my_caching_server:8080)"),
+ N("Here you can set up your proxies configuration (eg: http://my_caching_server:8080)") . if_($net->{PROFILE} && netprofile_count() > 0, "\n".N("Those settings will be saved for the network profile <b>%s</b>", $net->{PROFILE})),
[ { label => N("HTTP proxy"), val => \$u->{http_proxy} },
{ text => N("Use HTTP proxy for HTTPS connections"), val => \$use_http_for_https, type => "bool" },
{ label => N("HTTPS proxy"), val => \$u->{https_proxy}, disabled => sub { $use_http_for_https } },