From b3e7b3af6747803b0a37dff6ecd194f7d77e5c7e Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Mon, 14 Feb 2005 18:12:32 +0000
Subject: - Let printer autodetection results get into
 /root/drakx/report.bug.gz

---
 perl-install/printer/printerdrake.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'perl-install/printer')

diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index c2438d358..a35293840 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -672,8 +672,9 @@ sub first_time_dialog {
 
     my $w = $in->wait_message(N("Printerdrake"), N("Checking your system..."));
 
-    # Auto-detect local printers   
+    # Auto-detect local printers
     my @autodetected = printer::detect::local_detect();
+    $printer->{AUTODETECTEDLOCALPRINTERSFIRSTTIME} = \@autodetected if @autodetected;
     my $msg = do {
 	if (@autodetected) {
 	    my @printerlist = 
@@ -776,6 +777,7 @@ sub configure_new_printers {
 
     # Auto-detect local printers
     my @autodetected = printer::detect::local_detect();
+    $printer->{AUTODETECTEDPRINTERSNONINTERACTIVE} = \@autodetected if @autodetected;
 
     # We are ready with auto-detection, so we restart HPOJ here. If it 
     # is not installed or not configured, this command has no effect.
@@ -1152,6 +1154,7 @@ sub setup_local_autoscan {
 	    $expert_or_modify || $printer->{AUTODETECTLOCAL} ? printer::detect::local_detect() : (),
 	    !$expert_or_modify ? printer::detect::whatNetPrinter($printer->{AUTODETECTNETWORK}, $printer->{AUTODETECTSMB}, $printer->{TIMEOUT}) : (),
         );
+	$printer->{AUTODETECTEDPRINTERSADDPRINTERSTANDARD} = \@autodetected if @autodetected;
 	# We have more than one printer, so we must ask the user for a queue
 	# name in the fully automatic printer configuration.
 	$printer->{MORETHANONE} = $#autodetected > 0;
@@ -1523,7 +1526,8 @@ sub setup_smb {
 	}
 	my $_w = $in->wait_message(N("Printer auto-detection"), N("Scanning network..."));
 	@autodetected = printer::detect::net_smb_detect($printer->{TIMEOUT});
-     my ($server, $share);
+	$printer->{AUTODETECTEDPRINTERSADDPRINTEREXPERTSMB} = \@autodetected if @autodetected;
+	my ($server, $share);
 	foreach my $p (@autodetected) {
 	    my $menustr;
 	    if ($p->{port} =~ m!^smb://([^/:]+)/([^/:]+)$!) {
@@ -1776,7 +1780,8 @@ sub setup_socket {
 	$autodetect = 1;
 	my $_w = $in->wait_message(N("Printer auto-detection"), N("Scanning network..."));
 	@autodetected = printer::detect::net_detect($printer->{TIMEOUT});
-     my ($host, $port);
+	$printer->{AUTODETECTEDPRINTERSEXPERTSOCKET} = \@autodetected if @autodetected;
+	my ($host, $port);
 	foreach my $p (@autodetected) {
 	    my $menustr;
 	    if ($p->{port} =~ m!^socket://([^:]+):(\d+)$!) {
-- 
cgit v1.2.1