summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2002-02-13 15:28:11 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2002-02-13 15:28:11 +0000
commitdc1238ca5843f3a7a671487d6cd29911e4da5200 (patch)
tree6d30be85eaea48260831b37df80a6a6e56cb7f3d
parent8af248f0bd424376cd85143faf96b45c2cabb158 (diff)
downloaddrakx-backup-do-not-use-dc1238ca5843f3a7a671487d6cd29911e4da5200.tar
drakx-backup-do-not-use-dc1238ca5843f3a7a671487d6cd29911e4da5200.tar.gz
drakx-backup-do-not-use-dc1238ca5843f3a7a671487d6cd29911e4da5200.tar.bz2
drakx-backup-do-not-use-dc1238ca5843f3a7a671487d6cd29911e4da5200.tar.xz
drakx-backup-do-not-use-dc1238ca5843f3a7a671487d6cd29911e4da5200.zip
When one visited the help page of a remote CUPS printer afterwards the full
printer modification menu was shown, not only the one for remote CUPS printers. This is fixed now.
-rw-r--r--perl-install/printerdrake.pm20
1 files changed, 9 insertions, 11 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index b44b739a2..e7483cffe 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -1616,6 +1616,7 @@ sub printer_help {
my $default = $printer->{DEFAULT};
my $raw = 0;
my $cupsremote = 0;
+ my $scanning = "";
if ($printer->{configured}{$queue}) {
if (($printer->{configured}{$queue}{'queuedata'}{'model'} eq
_("Unknown model")) ||
@@ -1623,20 +1624,17 @@ sub printer_help {
_("Raw printer"))) {
$raw = 1;
}
+ # Information about scanning with HP's multi-function devices
+ $scanning = scanner_help
+ ($printer->{configured}{$queue}{'queuedata'}{'make'} . " " .
+ $printer->{configured}{$queue}{'queuedata'}{'model'},
+ $printer->{configured}{$queue}{'queuedata'}{'connect'});
+ if ($scanning) {
+ $scanning = "\n\n$scanning\n\n";
+ }
} else {
$cupsremote = 1;
}
- #my $foomatic = $printer->{configured}{$queue}{queuedata}{foomatic};
- #my $ppd = $printer->{configured}{$queue}{queuedata}{ppd};
-
- # Information about scanning with HP's multi-function devices
- my $scanning = scanner_help
- ($printer->{configured}{$queue}{'queuedata'}{'make'} . " " .
- $printer->{configured}{$queue}{'queuedata'}{'model'},
- $printer->{configured}{$queue}{'queuedata'}{'connect'});
- if ($scanning) {
- $scanning = "\n\n$scanning\n\n";
- }
my $dialogtext;
if ($spooler eq "cups") {