From 4eecdf7017657550486500c59707a3c5938f7839 Mon Sep 17 00:00:00 2001 From: Guillaume Cottenceau Date: Fri, 28 Feb 2003 16:09:17 +0000 Subject: reflect in standalone drakxtools the removal of DrakX icons --- perl-install/standalone/adduserdrake | 2 +- perl-install/standalone/drakbackup | 2 +- perl-install/standalone/drakboot | 2 +- perl-install/standalone/drakconnect | 2 +- perl-install/standalone/drakfirewall | 2 +- perl-install/standalone/drakfont | 2 +- perl-install/standalone/drakgw | 2 +- perl-install/standalone/drakperm | 2 +- perl-install/standalone/drakproxy | 2 +- perl-install/standalone/drakpxe | 2 +- perl-install/standalone/draksplash | 2 +- perl-install/standalone/drakxservices | 2 +- perl-install/standalone/drakxtv | 2 +- perl-install/standalone/harddrake2 | 2 +- perl-install/standalone/keyboarddrake | 2 +- perl-install/standalone/livedrake | 2 +- perl-install/standalone/logdrake | 2 +- perl-install/standalone/mousedrake | 2 +- perl-install/standalone/scannerdrake | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake index d1ebe4eef..4bbad2fa3 100755 --- a/perl-install/standalone/adduserdrake +++ b/perl-install/standalone/adduserdrake @@ -20,7 +20,7 @@ my $in; if (my @l = grep { ! /^-/ } @ARGV) { $users = [ map { { name => $_, realname => $_ } } @l ]; } else { - $in = 'interactive'->vnew('su', 'user'); + $in = 'interactive'->vnew('su'); any::ask_users('', $in, $users, $ENV{SECURE_LEVEL}); } diff --git a/perl-install/standalone/drakbackup b/perl-install/standalone/drakbackup index 235919e3f..aa88470cf 100755 --- a/perl-install/standalone/drakbackup +++ b/perl-install/standalone/drakbackup @@ -4529,7 +4529,7 @@ sub interactive_mode { die "Can't load ugtk2...\n" if $@; ugtk2->import(qw(:helpers :wrappers :create)); - $in = 'interactive'->vnew('', 'default'); + $in = 'interactive'->vnew; my $box; $my_win = ugtk2->new('drakbackup'); diff --git a/perl-install/standalone/drakboot b/perl-install/standalone/drakboot index ec40b3a56..1eeb19f3c 100755 --- a/perl-install/standalone/drakboot +++ b/perl-install/standalone/drakboot @@ -38,7 +38,7 @@ use Xconfig::various; use log; use bootloader; -my $in = 'interactive'->vnew('su', 'bootloader'); +my $in = 'interactive'->vnew('su'); if (!$in->isa('interactive::gtk')) { lilo_choice(); diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index 34649444b..b53f89687 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -48,7 +48,7 @@ my @conx_type = ('modem', 'isdn_internal', 'isdn_external', 'adsl', 'cable', 'la #$::wizard_xpm = "/usr/share/pixmaps/internet.xpm"; -my $in = 'interactive'->vnew('su', 'network'); +my $in = 'interactive'->vnew('su'); !$::isEmbedded && $in->isa('interactive::gtk') and $::isWizard = 1; #$::isWizard = 0; $::Wizard_pix_up = "wiz_drakconnect.png"; diff --git a/perl-install/standalone/drakfirewall b/perl-install/standalone/drakfirewall index 27dfb92a9..233445ad2 100755 --- a/perl-install/standalone/drakfirewall +++ b/perl-install/standalone/drakfirewall @@ -23,7 +23,7 @@ use standalone; #- warning, standalone must be loaded very first, for 'expla use interactive; use network::drakfirewall; -my $in = 'interactive'->vnew('su', 'default'); +my $in = 'interactive'->vnew('su'); network::drakfirewall::main($in); diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 634c68541..fb4d7cba8 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -92,7 +92,7 @@ use ugtk2 qw(:helpers :wrappers :create); use common; -my $in = 'interactive'->vnew('su', 'network'); +my $in = 'interactive'->vnew('su'); # global variables needed by each functions my $xlsfonts = 0; diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index ab191ce3a..5517ba53e 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -54,7 +54,7 @@ my $cups_conf = "/etc/cups/cupsd.conf"; my $shorewall = network::shorewall::read(); -my $in = 'interactive'->vnew('su', 'default'); +my $in = 'interactive'->vnew('su'); $::Wizard_title = N("Internet Connection Sharing"); !$::isEmbedded && $in->isa('interactive::gtk') and $::isWizard = 1; diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm index 39132d957..d0feb3aec 100755 --- a/perl-install/standalone/drakperm +++ b/perl-install/standalone/drakperm @@ -9,7 +9,7 @@ use common; use ugtk2 qw(:helpers :wrappers :create); use interactive; -my $in = 'interactive'->vnew('su', 'default'); +my $in = 'interactive'->vnew('su'); local $_ = join '', @ARGV; #- vars declaration diff --git a/perl-install/standalone/drakproxy b/perl-install/standalone/drakproxy index 692ccab8d..9b979e105 100755 --- a/perl-install/standalone/drakproxy +++ b/perl-install/standalone/drakproxy @@ -27,7 +27,7 @@ use any; use common; my $u = { getVarsFromSh('/etc/profile.d/proxy.sh') }; -my $in = 'interactive'->vnew('su', 'network'); +my $in = 'interactive'->vnew('su'); network::network::miscellaneous_choose($in, $u, 1, 1); network::network::proxy_configure($u); $in->exit(0); diff --git a/perl-install/standalone/drakpxe b/perl-install/standalone/drakpxe index 00dd27407..f8ffb2afa 100755 --- a/perl-install/standalone/drakpxe +++ b/perl-install/standalone/drakpxe @@ -52,7 +52,7 @@ my $netc = {}; my $intf = {}; network::read_all_conf('', $netc, $intf); -my $in = 'interactive'->vnew('su', 'default'); +my $in = 'interactive'->vnew('su'); $::Wizard_title = N("PXE Server Configuration"); !$::isEmbedded && $in->isa('interactive::gtk') and $::isWizard = 1; diff --git a/perl-install/standalone/draksplash b/perl-install/standalone/draksplash index b0d731877..08e3036c2 100755 --- a/perl-install/standalone/draksplash +++ b/perl-install/standalone/draksplash @@ -11,7 +11,7 @@ use interactive; my $true = 1; -my $in = 'interactive'->vnew('su', 'default'); +my $in = 'interactive'->vnew('su'); my $window = ugtk2->new; $window->{rwindow}->signal_connect(delete_event => \&CloseAppWindow); diff --git a/perl-install/standalone/drakxservices b/perl-install/standalone/drakxservices index bb6dea16d..5da4b4464 100755 --- a/perl-install/standalone/drakxservices +++ b/perl-install/standalone/drakxservices @@ -10,7 +10,7 @@ use interactive; use services; use log; -my $in = 'interactive'->vnew('su', 'services'); +my $in = 'interactive'->vnew('su'); begin: my $l = services::ask($in); services::doit($in, $l) if $l; diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv index d17f1dcba..1325c7957 100755 --- a/perl-install/standalone/drakxtv +++ b/perl-install/standalone/drakxtv @@ -29,7 +29,7 @@ use lang; use log; use common; -my $in = 'interactive'->vnew(); +my $in = 'interactive'->vnew; sub scan4channels { # xawtv has been installed by DrakX when/if it's detected a tv diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2 index 2db155065..23595ef55 100755 --- a/perl-install/standalone/harddrake2 +++ b/perl-install/standalone/harddrake2 @@ -126,7 +126,7 @@ my @menu_items = } ); -$in = 'interactive'->vnew('su', 'default'); +$in = 'interactive'->vnew('su'); my $wait = $in->wait_message(N("Please wait"), N("Detection in progress")); gtkflush(); diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake index f69005dad..ac49132a5 100755 --- a/perl-install/standalone/keyboarddrake +++ b/perl-install/standalone/keyboarddrake @@ -17,7 +17,7 @@ if (my ($kb) = grep { !/^-/ } @ARGV) { keyboard::KEYBOARD2text($kb) or die "bad keyboard $kb\n"; $keyboard->{KEYBOARD} = $kb; } else { - $in = 'interactive'->vnew('su', 'keyboard'); + $in = 'interactive'->vnew('su'); choose: $keyboard->{KEYBOARD} = $in->ask_from_listf(N("Keyboard"), diff --git a/perl-install/standalone/livedrake b/perl-install/standalone/livedrake index 03868c03b..3d34d08d7 100755 --- a/perl-install/standalone/livedrake +++ b/perl-install/standalone/livedrake @@ -9,7 +9,7 @@ use interactive; use run_program; use c; -my $in = 'interactive'->vnew('su', 'default'); +my $in = 'interactive'->vnew('su'); my $cd_mntpoint = "/mnt/cdrom"; diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index 098d9ec02..238d21275 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -30,7 +30,7 @@ use ugtk2 qw(:wrappers :helpers :create); $::isInstall and die "Not supported during install.\n"; -my $in = 'interactive'->vnew('su', 'default'); +my $in = 'interactive'->vnew('su'); my $cron_hourly = "/etc/cron.hourly/logdrake_service"; #- parse arguments list. diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index 3aa9e5d36..e6048a173 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -11,7 +11,7 @@ use mouse; use c; -my $in = 'interactive'->vnew('su', 'mouse'); +my $in = 'interactive'->vnew('su'); modules::mergein_conf('/etc/modules.conf') if -r '/etc/modules.conf'; diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index afc8a864b..c1e334e91 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -35,7 +35,7 @@ foreach (@ARGV) { /^--dynamic=(.*)$/ and do { dynamic($1); exit() }; } -my $in = 'interactive'->vnew('su', 'default'); +my $in = 'interactive'->vnew('su'); if (!files_exist('/usr/bin/scanimage', '/usr/bin/xsane', if_(files_exist("/usr/bin/gimp"), -- cgit v1.2.1