- Inform the user on first-time setup, both during or after installation, that he can set up a daemon-less CUPS client.

- Warn the user when printerdrake is set to daemon-less CUPS client but no server is specified.
- Fixed bug of local queues not being recognized when the spooler daemon is not running during printerdrake startup.
- Do not try to copy print queues when switchung from daemon-less CUPS to normal CUPS.
- Remove the client.conf when switching from daemon-less CUPS to normal CUPS.

1 files changed, 5 insertions, 4 deletions

diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake
index a6f0abff8..53f49034a 100755
--- a/perl-install/standalone/printerdrake
+++ b/perl-install/standalone/printerdrake
@@ -49,9 +49,8 @@ my $printer;
 
 my $in = 'interactive'->vnew('su', if_(!$::isEmbedded, 'printer-mdk'));
 
-my $commandline = $_;
 
-exit 0 unless printer::printerdrake::first_time_dialog($printer, $in);
+my $commandline = $_;
 
 # Data structure for GTK2 main window
 my $us = {};
@@ -88,6 +87,10 @@ my $w = $in->wait_message(N("Printerdrake"),
 # Get what was installed before
 eval { $printer = printer::main::getinfo('') };
 
+undef $w;
+
+exit 0 unless printer::printerdrake::first_time_dialog($printer, $in);
+
 # Were we in expert mode last time?
 $printer->{expert} = printer::main::get_usermode();
 
@@ -106,8 +109,6 @@ $commandline =~ /-lprng/ and
 $commandline =~ /-pdq/ and 
     $printer->{SPOOLER} = 'pdq'  and printer::main::read_configured_queues($printer);
 
-undef $w;
-
 if ($::isInstall) {
     # Interactive main window for installation
     printer::printerdrake::main($printer, $in, 1);