diff options
| author | damien <damien@mandriva.com> | 2001-06-11 16:17:21 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-06-11 16:17:21 +0000 |
| commit | 4cece7d7fc7b2735e7920dbbd7f5e8f1d2a03f93 (patch) | |
| tree | 732c0932018dd3161cf989e7579e93653aa807cd | |
| parent | d332035481b7bc08edbd192e5c6c3d67dafcd19d (diff) | |
| download | drakx-4cece7d7fc7b2735e7920dbbd7f5e8f1d2a03f93.tar drakx-4cece7d7fc7b2735e7920dbbd7f5e8f1d2a03f93.tar.gz drakx-4cece7d7fc7b2735e7920dbbd7f5e8f1d2a03f93.tar.bz2 drakx-4cece7d7fc7b2735e7920dbbd7f5e8f1d2a03f93.tar.xz drakx-4cece7d7fc7b2735e7920dbbd7f5e8f1d2a03f93.zip | |
updated
| -rw-r--r-- | perl-install/proxy.pm | 12 | ||||
| -rwxr-xr-x | perl-install/standalone/drakproxy | 10 |
2 files changed, 16 insertions, 6 deletions
diff --git a/perl-install/proxy.pm b/perl-install/proxy.pm index 04d5c0f68..f19ed4d82 100644 --- a/perl-install/proxy.pm +++ b/perl-install/proxy.pm @@ -1,12 +1,20 @@ package proxy; +use diagnostics; +use strict; +use run_program; +use common qw(:common :system :file); +use log; +use c; + sub main { my ($prefix, $in, $install) = @_; begin: $::Wizard_no_previous = 1; $in->ask_okcancel(_("Proxy configuration"), _("blabla proxy"), 1) or quit_global($in, 0); - my $url = $in->ask_from_entry($url, _("foo"), _("url")); - print STDERR $url, "\n"; + my $url; + my $e = $in->ask_from_entry($url, _("foo"), _("url")); + print "$url / $e \n"; undef $::Wizard_no_previous; log::l("[drakproxy] Installation complete, exiting\n"); } diff --git a/perl-install/standalone/drakproxy b/perl-install/standalone/drakproxy index 127edaf67..e9cd3f241 100755 --- a/perl-install/standalone/drakproxy +++ b/perl-install/standalone/drakproxy @@ -15,12 +15,11 @@ use lib qw(/usr/lib/libDrakX); -use common qw(:common :system :file); use interactive; use standalone; -use log; -use c; use proxy; + +use my_gtk qw(:helpers :wrappers); # use detect_devices; $::isEmbedded = ($::XID, $::CCPID) = "@ARGV" =~ /--embedded (\w+) (\w+)/; @@ -52,7 +51,7 @@ gtkadd($window1, new Gtk::Label _("Welcome to the Proxy Connection utility Click on Configure to launch the setup wizard."), - ) + ), 1, gtkpack(my $hbox2 = new Gtk::HBox(0,0),), 0, gtkadd(gtkset_layout(new Gtk::HButtonBox, -end), gtksignal_connect(new Gtk::Button _("Configure"), clicked => sub { system ("/usr/sbin/drakgw --wizard") }), @@ -68,6 +67,9 @@ Gtk->exit(0); #------------------------------------------------- #- $Log$ +#- Revision 1.3 2001/06/11 16:17:21 damien +#- updated +#- #- Revision 1.2 2001/06/11 16:03:10 damien #- perlised #- |