summaryrefslogtreecommitdiffstats
path: root/perl-install/printerdrake.pm
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-07-23 10:35:55 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-07-23 10:35:55 +0000
commit6ed6b5341362f87e3c70420f206a33f71c72a3de (patch)
treeff028b5845f88d0a485f8c20ae726e462627aa59 /perl-install/printerdrake.pm
parente2889facfca0f6c6f64e2194f913a6b525f255e0 (diff)
downloaddrakx-6ed6b5341362f87e3c70420f206a33f71c72a3de.tar
drakx-6ed6b5341362f87e3c70420f206a33f71c72a3de.tar.gz
drakx-6ed6b5341362f87e3c70420f206a33f71c72a3de.tar.bz2
drakx-6ed6b5341362f87e3c70420f206a33f71c72a3de.tar.xz
drakx-6ed6b5341362f87e3c70420f206a33f71c72a3de.zip
- Big Move 1: interactive::* hierarchy
Diffstat (limited to 'perl-install/printerdrake.pm')
-rw-r--r--perl-install/printerdrake.pm28
1 files changed, 6 insertions, 22 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index f158d5142..86541ffe1 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -2572,7 +2572,7 @@ sub main {
#if ((!$::expert) && (!$::isEmbedded) && (!$::isInstall) &&
if ((!$::isEmbedded) && (!$::isInstall) &&
#if ((!$::isInstall) &&
- ($in->isa('interactive_gtk'))) {
+ ($in->isa('interactive::gtk'))) {
$continue = 1;
# Enter wizard mode
$::Wizard_pix_up = "wiz_printerdrake.png";
@@ -2915,14 +2915,11 @@ What do you want to modify on this printer?",
# Delete some variables
$printer->{OLD_QUEUE} = "";
- $printer->{QUEUE} = "";
- $printer->{TYPE} = "";
- $printer->{str_type} = "";
+ foreach (qw(QUEUE TYPE str_type DBENTRY ARGS OLD_CHOICE)) {
+ $printer->{$_} = "";
+ }
$printer->{currentqueue} = {};
- $printer->{DBENTRY} = "";
- $printer->{ARGS} = "";
$printer->{complete} = 0;
- $printer->{OLD_CHOICE} = "";
}
# Clean up the $printer data structure for auto-install log
for my $queue (keys %{$printer->{configured}}) {
@@ -2935,20 +2932,7 @@ What do you want to modify on this printer?",
delete($printer->{configured}{$queue}{queuedata}{menuentry});
}
}
- delete($printer->{OLD_QUEUE});
- delete($printer->{QUEUE});
- delete($printer->{TYPE});
- delete($printer->{str_type});
- delete($printer->{currentqueue});
- delete($printer->{DBENTRY});
- delete($printer->{ARGS});
- delete($printer->{complete});
- delete($printer->{OLD_CHOICE});
- delete($printer->{NEW});
- delete($printer->{MORETHANONE});
- delete($printer->{MANUALMODEL});
- #use Data::Dumper;
- #print "###############################################################################\n", Dumper($printer);
-
+ foreach (qw(Old_queue QUEUE TYPE str_type currentqueue DBENTRY ARGS complete OLD_CHOICE NEW MORETHANONE MANUALMODEL))
+ { delete $printer->{$_} };
}