From cbb14fa41aa61e834c2ee472c58164bc43eb87dd Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Mon, 5 Aug 2002 18:12:53 +0000
Subject: Make/Model/Driver list in expert mode: Fixed bug of "recommended"
 driver entries getting a duplicate entry without "recommended" when entering
 the list via double-click on existing queue / "Printer manufacturer, model,
 driver".

---
 perl-install/printerdrake.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index b502fc486..d190638d8 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -1333,7 +1333,7 @@ sub setup_common {
 	$descr =~ s/\s+\(?[Pp]rinter\)?$//;
 	$printer->{DBENTRY} = "";
 	for my $entry (keys(%printer::thedb)) {
-	    if ($entry =~ m!$descr!) {
+	    if ($entry =~ m!$descr!i) {
 		$printer->{DBENTRY} = $entry;
 		last;
 	    }
@@ -1427,7 +1427,7 @@ sub get_db_entry {
 		$printer->{DBENTRY} = "$make|$model|$driverstr";
 		# database key contains the "(recommended)" for the
 		# recommended driver, so add it if necessary
-		if (!($printer::thedb{$printer->{DBENTRY}}{printer})) {
+		if (!member($printer->{DBENTRY}, keys(%printer::thedb))) {
 		    $printer->{DBENTRY} .= " (recommended)";
 		}
 	    } else {
@@ -1529,7 +1529,7 @@ sub choose_model {
 	my $w = $in->wait_message('', _("Reading printer database..."));
         printer::read_printer_db($printer->{SPOOLER});
     }
-    if (!$printer::thedb{$printer->{DBENTRY}}) {
+    if (!member($printer->{DBENTRY}, keys(%printer::thedb))) {
 	$printer->{DBENTRY} = _("Raw printer (No driver)");
     }
     # Choose the printer/driver from the list
-- 
cgit v1.2.1