From a3e052ab504110709bed840d5845da17b9708273 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Thu, 27 Feb 2003 18:27:23 +0000
Subject: Make OpenOffice.org opening a GUI printing tool when printing with
 the "Generic Printer".

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

diff --git a/perl-install/printer/data.pm b/perl-install/printer/data.pm
index 3efca01b1..4985cadc4 100644
--- a/perl-install/printer/data.pm
+++ b/perl-install/printer/data.pm
@@ -11,6 +11,7 @@ use vars qw(@ISA @EXPORT);
 our %spoolers = ('pdq' => {
                           'help' => "/usr/bin/pdq -h -P %s 2>&1 |",
 			  'print_command' => 'lpr-pdq',
+			  'print_gui' => 'xpdq',
 			  'long_name' => N("PDQ - Print, Don't Queue"),
 			  'short_name' => N("PDQ"),
                           'packages2add' => [ [ 'pdq' ], [qw(/usr/bin/pdq /usr/X11R6/bin/xpdq)] ],
@@ -21,7 +22,8 @@ our %spoolers = ('pdq' => {
                           ],
                  },
                 'lpd' => {
-                        'print_command' => 'lpr',
+                        'print_command' => 'lpr-lpd',
+			'print_gui' => 'gpr',
 			'long_name' => N("LPD - Line Printer Daemon"),
                         'short_name' => N("LPD"),
                         'boot_spooler' => 'lpd',
@@ -43,6 +45,7 @@ our %spoolers = ('pdq' => {
                  },
 		 'lprng' => {
 		     'print_command' => 'lpr-lpd',
+		     'print_gui' => 'gpr',
 		     'long_name' => N("LPRng - LPR New Generation"),
 		     'short_name' => N("LPRng"),
 		     'boot_spooler' => 'lpd',
@@ -68,6 +71,7 @@ our %spoolers = ('pdq' => {
 		 'cups' => {
 		     'help' => "/usr/bin/lphelp %s |",
 		     'print_command' => 'lpr-cups',
+		     'print_gui' => 'xpp',
 		     'long_name' => N("CUPS - Common Unix Printing System"),
 		     'short_name' => N("CUPS"),
 		     'boot_spooler' => 'cups',
diff --git a/perl-install/printer/office.pm b/perl-install/printer/office.pm
index 235ebf12a..f4a01a224 100644
--- a/perl-install/printer/office.pm
+++ b/perl-install/printer/office.pm
@@ -106,7 +106,7 @@ sub configureoffice {
     $configfilecontent =
 	addentry($parameters[0],
 		 $parameters[1] . $suites->{$suite}{perl} . 
-		 $spoolers{$printer->{SPOOLER}}{print_command},
+		 $spoolers{$printer->{SPOOLER}}{print_gui},
 		 $configfilecontent);
     # Write back Star Office configuration file
     return eval { output("$::prefix$configfilename", $configfilecontent) };
-- 
cgit v1.2.1