From 08cfcfa9b2470a6fb9c72f51c8ee37f80ecbdcde Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 7 Jan 2003 14:56:34 +0000
Subject: fix new data structure usage

---
 perl-install/printer/gimp.pm   | 4 ++--
 perl-install/printer/office.pm | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/perl-install/printer/gimp.pm b/perl-install/printer/gimp.pm
index a6bf28bbf..db7d50470 100644
--- a/perl-install/printer/gimp.pm
+++ b/perl-install/printer/gimp.pm
@@ -198,7 +198,7 @@ sub makeprinterentry {
 	$configfile = addentry($queue, "Driver: $gimpprintdriver", $configfile);
 	$configfile = removeentry($queue, "Destination:", $configfile);
 	$configfile = addentry($queue, 
-				   sprintf("Destination: /usr/bin/%s -P %s -o raw", $spoolers{$printer->{SPOOLER}{print_command}}, $queue), $configfile);
+				   sprintf("Destination: /usr/bin/%s -P %s -o raw", $spoolers{$printer->{SPOOLER}}{print_command}, $queue), $configfile);
     } else {
 	$configfile = removeentry($queue, "PPD-File:", $configfile);
 	$configfile = addentry($queue, "PPD-File: /etc/foomatic/$queue.ppd", $configfile);
@@ -206,7 +206,7 @@ sub makeprinterentry {
 	$configfile = addentry($queue, "Driver: ps2", $configfile);
 	$configfile = removeentry($queue, "Destination:", $configfile);
 	$configfile = addentry($queue, 
-				   sprintf("Destination: /usr/bin/%s -P %s", $spoolers{$printer->{SPOOLER}{print_command}}, $queue), $configfile);
+				   sprintf("Destination: /usr/bin/%s -P %s", $spoolers{$printer->{SPOOLER}}{print_command}, $queue), $configfile);
     }
     return $configfile;
 }
diff --git a/perl-install/printer/office.pm b/perl-install/printer/office.pm
index 31e54a4fc..d8479249a 100644
--- a/perl-install/printer/office.pm
+++ b/perl-install/printer/office.pm
@@ -98,7 +98,7 @@ sub configureoffice {
     # the "Generic Printer"
     my @parameters = $suites{$suite}{param};
     $configfilecontent = removeentry(@parameters, $configfilecontent);
-    $configfilecontent = addentry($parameters[0], $parameters[1] . $suites{$suite}{perl} . $spoolers{$printer->{SPOOLER}{print_command}}, $configfilecontent);
+    $configfilecontent = addentry($parameters[0], $parameters[1] . $suites{$suite}{perl} . $spoolers{$printer->{SPOOLER}}{print_command}, $configfilecontent);
     # Write back Star Office configuration file
     return eval { output("$::prefix$configfilename", $configfilecontent) };
 }
@@ -207,7 +207,7 @@ sub makestarofficeprinterentry {
     # symbol correctly.
     $configfile = removeentry("ports", "$queue=", $configfile);
     $configfile = addentry("ports", 
-			   "$queue=/usr/bin/perl -p -e \"s=16#80 /euro=16#80 /Euro=\" | /usr/bin/" . $spoolers{$printer->{SPOOLER}{print_command}} . " -P $queue",
+			   "$queue=/usr/bin/perl -p -e \"s=16#80 /euro=16#80 /Euro=\" | /usr/bin/" . $spoolers{$printer->{SPOOLER}}{print_command} . " -P $queue",
 			   $configfile);
     # Make printer's section
     $configfile = addsection("$queue,PostScript,$queue", $configfile);
@@ -261,7 +261,7 @@ sub makeopenofficeprinterentry {
     # symbol correctly.
     $configfile = removeentry($queue, "Command=", $configfile);
     $configfile = addentry($queue, 
-			   "Command=/usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/" . $spoolers{$printer->{SPOOLER}{print_command}} . " -P $queue",
+			   "Command=/usr/bin/perl -p -e \"s=/euro /unused=/Euro /unused=\" | /usr/bin/" . $spoolers{$printer->{SPOOLER}}{print_command} . " -P $queue",
 			   $configfile);
     # "Comment" line 
     $configfile = removeentry($queue, "Comment=", $configfile);
-- 
cgit v1.2.1