summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-12-11 15:57:19 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-12-11 15:57:19 +0000
commit84b6811ea2832b93d9737f5ffbb1f28b3333a14e (patch)
treef81c2766597efd35384fa41f90c342f234300cef
parentdadaaf1fcfd690026514f0c76eeeb867b9ca5fa4 (diff)
downloaddrakx-backup-do-not-use-84b6811ea2832b93d9737f5ffbb1f28b3333a14e.tar
drakx-backup-do-not-use-84b6811ea2832b93d9737f5ffbb1f28b3333a14e.tar.gz
drakx-backup-do-not-use-84b6811ea2832b93d9737f5ffbb1f28b3333a14e.tar.bz2
drakx-backup-do-not-use-84b6811ea2832b93d9737f5ffbb1f28b3333a14e.tar.xz
drakx-backup-do-not-use-84b6811ea2832b93d9737f5ffbb1f28b3333a14e.zip
perl_checker fix
-rwxr-xr-xperl-install/standalone/drakconnect18
1 files changed, 6 insertions, 12 deletions
diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect
index 1b0ef84f3..3e582d997 100755
--- a/perl-install/standalone/drakconnect
+++ b/perl-install/standalone/drakconnect
@@ -49,7 +49,11 @@ my ($netcnx, $netc, $intf) = ({}, {}, {});
my @conx_type = ('modem', 'isdn_internal', 'isdn_external', 'adsl', 'cable', 'lan');
my $in = 'interactive'->vnew('su');
-!$::isEmbedded and $in->isa('interactive::gtk');
+if ($in->isa('interactive::gtk')) {
+ require ugtk2;
+ ugtk2->import(qw(:create :dialogs :helpers :wrappers));
+ reread_net_conf();
+}
$::Wizard_pix_up = "wiz_drakconnect.png";
MDK::Common::Globals::init(
@@ -64,24 +68,14 @@ MDK::Common::Globals::init(
/--skip-wizard/ and goto manage;
/--add/ and add_intf();
/--del/ and del_intf();
-/--internet/ and do {
- init();
- configure_net($netcnx, $netc, $intf);
-};
+/--internet/ and configure_net($netcnx, $netc, $intf);
# default is to run wizard
add_intf();
my @all_cards;
-sub init() {
- require ugtk2;
- ugtk2->import(qw(:create :dialogs :helpers :wrappers));
- reread_net_conf();
-}
-
manage:
-init();
my $window1 = ugtk2->new('drakconnect');
$window1->{rwindow}->signal_connect(delete_event => sub { ugtk2->exit(0) });
unless ($::isEmbedded) {