From 1d37bfdbbe874abd6dcb5563eea19f531de09e1c Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 25 May 2007 15:39:46 +0000 Subject: sync with 2007.1 (because of SVN loss) --- bin/drakproxy | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'bin/drakproxy') diff --git a/bin/drakproxy b/bin/drakproxy index 9ef2f28..0752f7b 100755 --- a/bin/drakproxy +++ b/bin/drakproxy @@ -2,7 +2,7 @@ # DrakProxy -# Copyright (C) 1999-2005 Mandriva (damien@mandrakesoft.com) +# Copyright (C) 1999-2006 Mandriva (damien@mandrakesoft.com) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,6 +20,8 @@ use lib qw(/usr/lib/libDrakX); +# i18n: IMPORTANT: to get correct namespace (drakx-net instead of libDrakX) +BEGIN { unshift @::textdomains, 'drakx-net' } use standalone; #- warning, standalone must be loaded very first, for 'explanations' use interactive; use network::network; @@ -29,6 +31,11 @@ use common; $ugtk2::wm_icon = "/usr/share/mcc/themes/default/drakproxy-mdk.png"; my $u = { getVarsFromSh('/etc/profile.d/proxy.sh') }; my $in = 'interactive'->vnew('su'); -network::network::miscellaneous_choose($in, $u); -network::network::proxy_configure($u); +if (network::network::miscellaneous_choose($in, $u)) { + network::network::proxy_configure($u); + if ($in->ask_okcancel(N("Warning"), N("You need to log out and back in again for changes to take effect"), 1)) { + my $wm = any::running_window_manager(); + $wm and any::ask_window_manager_to_logout($wm); + } +} $in->exit(0); -- cgit v1.2.1