diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2002-02-04 23:24:07 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2002-02-04 23:24:07 +0000 |
| commit | 7be6a2b9bffb4c57e689e128209aa875bb5459d7 (patch) | |
| tree | b25ec30b9c233a47ed4781e698926f8b29e24030 /perl-install/printer.pm | |
| parent | bcc539482167d26f13832f17061aed7a4848fe8e (diff) | |
| download | drakx-7be6a2b9bffb4c57e689e128209aa875bb5459d7.tar drakx-7be6a2b9bffb4c57e689e128209aa875bb5459d7.tar.gz drakx-7be6a2b9bffb4c57e689e128209aa875bb5459d7.tar.bz2 drakx-7be6a2b9bffb4c57e689e128209aa875bb5459d7.tar.xz drakx-7be6a2b9bffb4c57e689e128209aa875bb5459d7.zip | |
Made HP multi-function devices configured with HPOJ being displayed correctly by printerdrake.
Diffstat (limited to 'perl-install/printer.pm')
| -rw-r--r-- | perl-install/printer.pm | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm index a62ecbb94..98e7b4d85 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -504,7 +504,7 @@ sub make_menuentry { my $spooler = $shortspooler_inv{$printer->{SPOOLER}}; my $connect = $printer->{configured}{$queue}{'queuedata'}{'connect'}; my $localremote; - if (($connect =~ m!^file:!) || ($connect =~ m!^ptal:!)) { + if (($connect =~ m!^file:!) || ($connect =~ m!^ptal:/mlc:!)) { $localremote = _("Local Printers"); } else { $localremote = _("Remote Printers"); @@ -518,6 +518,19 @@ sub make_menuentry { } elsif ($connect =~ m!^file:/dev/usb/lp(\d+)$!) { my $number = $1; $connection = _(", USB printer \#%s", $number); + } elsif ($connect =~ m!^ptal:/(.+)$!) { + my $ptaldevice = $1; + if ($ptaldevice =~ /^mlc:par:(\d+)$/) { + my $number = $1; + $connection = _(", multi-function device on parallel port \#%s", + $number); + } elsif ($ptaldevice =~ /^mlc:usb:/) { + $connection = _(", multi-function device on USB"); + } elsif ($ptaldevice =~ /^hpjd:/) { + $connection = _(", multi-function device on HP JetDirect"); + } else { + $connection = _(", multi-function device"); + } } elsif ($connect =~ m!^file:(.+)$!) { $connection = _(", printing to %s", $1); } elsif ($connect =~ m!^lpd://([^/]+)/([^/]+)/?$!) { |