From 4c6d89462e28776dd392f85b6f0291f19a522925 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Tue, 2 Mar 2004 15:51:02 +0000
Subject: Sometimes option default settings in the printer options dialog were
 missing (e. g. "Dithering Pixels Per Inch" in "pcl3" driver). Fixed.

---
 perl-install/printer/printerdrake.pm | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'perl-install/printer')

diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index d428ec656..88f60828b 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -2881,8 +2881,8 @@ You should make sure that the page size and the ink type/printing mode (if avail
 	    }
 	    if ($printer->{ARGS}[$i]{type} eq 'enum') {
 		# enumerated option
-		push(@choicelists, []);
-		push(@shortchoicelists, []);
+		$choicelists[$i] = [];
+		$shortchoicelists[$i] = [];
 		foreach my $choice (@{$printer->{ARGS}[$i]{vals}}) {
 		    push(@{$choicelists[$i]}, $choice->{comment});
 		    push(@{$shortchoicelists[$i]}, $choice->{value});
@@ -2901,16 +2901,16 @@ You should make sure that the page size and the ink type/printing mode (if avail
 		    if ($printer->{ARGS}[$i]{name} ne 'PageRegion');
 	    } elsif ($printer->{ARGS}[$i]{type} eq 'bool') {
 		# boolean option
-		push(@choicelists, [($printer->{ARGS}[$i]{comment_true} ||
+		$choicelists[$i] = [($printer->{ARGS}[$i]{comment_true} ||
 				     $printer->{ARGS}[$i]{name} || "Yes"),
 				    ($printer->{ARGS}[$i]{comment_false} ||
 				     $printer->{ARGS}[$i]{name_false} ||
-				     "No")]);
-		push(@shortchoicelists, []);
+				     "No")];
+		$shortchoicelists[$i] = [];
 		my $numdefault = 
 		    ($optshortdefault =~ m!^\s*(true|on|yes|1)\s*$! ? 
 		     "1" : "0");
-		push(@userinputs, $choicelists[$i][1-$numdefault]);
+		$userinputs[$i] = $choicelists[$i][1-$numdefault];
 		push(@widgets,
 		     { label => $printer->{ARGS}[$i]{comment},
 		       val => \$userinputs[$i],
@@ -2921,9 +2921,9 @@ You should make sure that the page size and the ink type/printing mode (if avail
 		       help => $helptext });
 	    } else {
 		# numerical option
-		push(@choicelists, []);
-		push(@shortchoicelists, []);
-		push(@userinputs, $optshortdefault);
+		$choicelists[$i] = [];
+		$shortchoicelists[$i] = [];
+		$userinputs[$i] = $optshortdefault;
 		push(@widgets,
 		     { label => $printer->{ARGS}[$i]{comment} . 
 			   " ($printer->{ARGS}[$i]{min}... " .
-- 
cgit v1.2.1