From 115642e472a721aee88a1ba7e4884c8de4799fac Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Fri, 27 Aug 2004 18:19:38 +0000
Subject: - Made support for daemon-less CUPS client working. - Fixed graying
 out of buttons/menu entries in the main window.

---
 perl-install/printer/default.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/perl-install/printer/default.pm b/perl-install/printer/default.pm
index af997fd48..b6f45c889 100644
--- a/perl-install/printer/default.pm
+++ b/perl-install/printer/default.pm
@@ -11,17 +11,21 @@ my $FOOMATIC_DEFAULT_SPOOLER = "$FOOMATICCONFDIR/defaultspooler";
 
 sub set_printer {
     my ($printer) = $_[0];
+    my $spooler = $printer->{SPOOLER};
+    $spooler = "cups" if $spooler eq "rcups";
     run_program::rooted($::prefix, "foomatic-configure",
-			"-D", "-q", "-s", $printer->{SPOOLER},
+			"-D", "-q", "-s", $spooler,
 			"-n", $printer->{DEFAULT}) or return 0;
     return 1;
 }
 
 sub get_printer {
     my $printer = $_[0];
+    my $spooler = $printer->{SPOOLER};
+    $spooler = "cups" if $spooler eq "rcups";
     local *F;
     open F, ($::testing ? $::prefix : "chroot $::prefix/ ") . 
-	"foomatic-configure -Q -q -s $printer->{SPOOLER} |" or return undef;
+	"foomatic-configure -Q -q -s $spooler |" or return undef;
     my $line;
     while ($line = <F>) {
 	if ($line =~ m!^\s*<defaultqueue>(.*)</defaultqueue>\s*$!) {
-- 
cgit v1.2.1