From 80f25b9dafc6fb4c53294b7cca25ef8150d531ec Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Fri, 22 Aug 2003 20:23:01 +0000
Subject: Support for the new "ptal://..." (two slashes) URIs of the new HPOJ.

---
 perl-install/printer/main.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install/printer/main.pm')

diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index d0c4639bf..9c36fa55a 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -322,7 +322,7 @@ sub make_menuentry {
     my $connect = $printer->{configured}{$queue}{queuedata}{connect};
     my $localremote;
     if ($connect =~ m!^(file|parallel|usb|serial):! || 
-	$connect =~ m!^ptal:/mlc:! ||
+	$connect =~ m!^ptal://?mlc:! ||
 	$connect =~ m!^mtink:!) {
 	$localremote = N("Local Printers");
     } else {
@@ -339,7 +339,7 @@ sub make_menuentry {
 	$connection = N(", USB printer #%s", $number);
     } elsif ($connect =~ m!^usb://!) {
 	$connection = N(", USB printer");
-    } elsif ($connect =~ m!^ptal:/(.+)$!) {
+    } elsif ($connect =~ m!^ptal://?(.+?)$!) {
 	my $ptaldevice = $1;
 	if ($ptaldevice =~ /^mlc:par:(\d+)$/) {
 	    my $number = $1;
@@ -1993,10 +1993,10 @@ sub autodetectionentry_for_uri {
 		return $p;
 	    }
 	}
-    } elsif ($uri =~ m!^ptal:/mlc:!) {
+    } elsif ($uri =~ m!^ptal://?mlc:!) {
 	# HP multi-function device (controlled by HPOJ)
 	my $ptaldevice = $uri;
-	$ptaldevice =~ s!^ptal:/mlc:!!;
+	$ptaldevice =~ s!^ptal://?mlc:!!;
 	if ($ptaldevice =~ /^par:(\d+)$/) {
 	    my $device = "/dev/lp$1";
 	    foreach my $p (@autodetected) {
-- 
cgit v1.2.1