From fc56e58fdc5789f21d722005f0393a3bca5e5e1f Mon Sep 17 00:00:00 2001 From: Damien Chaumette Date: Wed, 11 Jun 2003 17:44:49 +0000 Subject: - s/interactive_gtk/interactive::gtk/ to get sub pre_func usable - drop write_on_pixmap way --- perl-install/network/netconnect.pm | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) (limited to 'perl-install/network/netconnect.pm') diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index b0e1ef647..1f61cf770 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -43,28 +43,10 @@ sub detect { sub pre_func { my ($text) = @_; - $in->isa('interactive_gtk') or return; + $in->isa('interactive::gtk') or return; $::Wizard_no_previous = 1; - if ($::isStandalone) { - $::Wizard_splash = 1; - require ugtk2; - ugtk2->import(qw(:wrappers :helpers)); - my $W = ugtk2->new(N("Network Configuration Wizard")); - gtkadd($W->{window}, - gtkpack_(new Gtk2::VBox(0, 0), - 1, write_on_pixmap(gtkcreate_img("drakconnect_step"), #BUG: write_on_pixmap is in my_gtk only, not in ugtk2 !!! - 20,200, - N("We are now going to configure the %s connection.", translate($text)), - ), - 0, $W->create_okcancel(N("OK")) - ) - ); - $W->main; - $::Wizard_splash = 0; - } else { - #- for i18n : %s is the type of connection of the list: (modem, isdn, adsl, cable, local network); - $in->ask_okcancel(N("Network Configuration Wizard"), N("\n\n\nWe are now going to configure the %s connection.\n\n\nPress OK to continue.", translate($text)), 1); - } + #- for i18n : %s is the type of connection of the list: (modem, isdn, adsl, cable, local network); + $in->ask_okcancel(N("Network Configuration Wizard"), N("\n\n\nWe are now going to configure the %s connection.\n\n\nPress OK to continue.", translate($text)), 1); undef $::Wizard_no_previous; } -- cgit v1.2.1