1 files changed, 315 insertions, 115 deletions

diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 5a377b70b..947c4c086 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 
-# scannerdrake $Id$
-# Yves Duret <yduret at mandrakesoft.com>
-# Copyright (C) 2001-2002 MandrakeSoft
+# Yves Duret
+# Till Kamppeter
+# Copyright (C) 2001-2008 Mandriva
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,38 +28,53 @@ use scanner;
 use handle_configs;
 use services;
 
+my $distroname = "%s";
+my $shortdistroname = "%s";
+
 foreach (@ARGV) {
     /^--update-usbtable$/ and do { scanner::updateScannerDBfromUsbtable(); exit() };
     /^--update-sane=(.*)$/ and do { scanner::updateScannerDBfromSane($1); exit() };
     /^--manual$/ and $::Manual=1;
-    /^--dynamic=(.*)$/ and do { dynamic($1); exit() };
+    /^--dynamic=(.*)$/ and do { dynamic(); exit() };
 }
 
-my $in = 'interactive'->vnew('su', 'default');
-if (!files_exist('/usr/bin/scanimage',
-		 '/usr/bin/xsane',
-		 if_(files_exist("/usr/bin/gimp"),
-		     "/usr/lib/gimp/*/plug-ins/xsane"))) {
-    $in->do_pkgs->install('sane-backends', 'xsane', 
-			  if_($in->do_pkgs->is_installed('gimp'),
-			      'xsane-gimp'));
+$ugtk3::wm_icon = "scannerdrake";
+my $in = 'interactive'->vnew('su');
+if (!files_exist(qw(/usr/bin/scanimage
+		    /etc/sane.d/dll.conf)) ||
+    (!files_exist(qw(/usr/bin/xsane)) &&
+     !files_exist(qw(/usr/bin/skanlite)) &&
+     !$in->do_pkgs->is_installed('scanner-gui'))) {
+    if (!$in->ask_yesorno(N("Warning"), N("SANE packages need to be installed to use scanners.
+
+Do you want to install the SANE packages?"))) {
+	$in->ask_warn(N("Warning"), 
+		      N("Aborting Scannerdrake."));
+	exit 0;
+    }
+    if (!$in->do_pkgs->install('task-scanning')) {
+	$in->ask_warn(N("Error"),
+		      N("Could not install the packages needed to set up a scanner with Scannerdrake.") . " " .
+		      N("Scannerdrake will not be started now."));
+	exit 0;
+    }
 }
 if ($::Manual) { manual(); quit() }
-$::CCPID and kill 'USR2', $::CCPID;
-my $wait = $in->wait_message(N("Scannerdrake"),
-			     N("Searching for configured scanners ..."));
-my @c = scanner::configured();
-$wait = $in->wait_message(N("Scannerdrake"),
-			     N("Searching for new scanners ..."));
+my $wait = $in->wait_message(N("Please wait"),
+			     N("Searching for configured scanners..."));
+my @c = scanner::configured($in);
+$wait = undef;
+$wait = $in->wait_message(N("Please wait"),
+			     N("Searching for new scanners..."));
 my @f = scanner::detect(@c);
 $wait = undef;
 my $changed = 0;
 @f and $changed = auto();
 if ($changed) {
-    my $wait =
-	$in->wait_message(N("Scannerdrake"),
-			  N("Re-generating list of configured scanners ..."));
-    @c = scanner::configured();
+    my $_wait =
+	$in->wait_message(N("Please wait"),
+			  N("Re-generating list of configured scanners..."));
+    @c = scanner::configured($in);
 }
 mainwindow(@c);
 quit();
@@ -67,41 +82,39 @@ quit();
 sub removeverticalbar {
     my ($s) = @_;
     $s =~ s/\|/ /g;
-    $s =~ /^\s*(\S+)\s+/;
-    my $make = $1;
-    my $searchmake = handle_configs::searchstr($make);
+    my $searchmake = handle_configs::searchstr(first($s =~ /^\s*(\S+)\s+/));
     $s =~ s/($searchmake)\s*$searchmake/$1/;
     return $s; 
 }
 
-sub auto {
+sub auto() {
     my $changed = 0;
     foreach (@f) {
 	my $c = 0;
-	if (member($_->{val}{DESCRIPTION}, keys %$scanner::scannerDB)) {
+	if (exists $scanner::scannerDB->{$_->{val}{DESCRIPTION}}) {
 	    my $name = $_->{val}{DESCRIPTION};
 	    $name =~ s/\s$//; # some HP entries have a trailing space, i will correct usbtable asap
 	    if ($scanner::scannerDB->{$name}{flags}{unsupported}) {
-		$in->ask_warn('Scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", removeverticalbar($name)));
+		$in->ask_warn(N("Error"), N("The %s is not supported by this version of %s.", removeverticalbar($name), $distroname));
 		next;
 	    }
-	    if ($in->ask_yesorno('Scannerdrake', N("%s found on %s, configure it automatically?", removeverticalbar($name), $_->{port}),1)) {
-		$c = (tryConfScanner($name, $_->{port}, 
+	    if ($in->ask_yesorno(N("Confirmation"), N("%s found on %s, configure it automatically?", removeverticalbar($name), $_->{port}),1)) {
+		$c = tryConfScanner($name, $_->{port}, 
 				     $_->{val}{vendor},
-				     $_->{val}{id}) or 
+				     $_->{val}{id}) || 
 		      manual($_->{port}, $_->{val}{vendor},
-			     $_->{val}{id}, $name));
+			     $_->{val}{id}, $name);
 	    } else {
 		$c = manual($_->{port}, $_->{val}{vendor},
 			    $_->{val}{id}, $name);
 	    }
 	} else {
-	    $in->ask_yesorno('Scannerdrake',
+	    $in->ask_yesorno(N("Confirmation"),
 			     N("%s is not in the scanner database, configure it manually?", 
 			       removeverticalbar($_->{val}{DESCRIPTION})),1)
-		and ($c =
+		and $c =
 		     manual($_->{port}, $_->{val}{vendor}, $_->{val}{id},
-			    $_->{val}{DESCRIPTION}));
+			    $_->{val}{DESCRIPTION});
 	}
 	$changed ||= $c;
     }
@@ -111,54 +124,208 @@ sub auto {
 sub manual {
     my ($port, $vendor, $product, $name) = @_;
     my $s = 
-	$in->ask_from_treelist('Scannerdrake', 
-			       N("Select a scanner model") .
-			       if_($port || $name, N(" (")) .
-			       if_($name, N("Detected model: %s",
-					    removeverticalbar($name))) .
-			       if_($port && $name, N(", ")) .
-			       if_($port, N("Port: %s", $port)) .
-			       if_($port || $name, N(")")),
-			       '|', [' None', keys %$scanner::scannerDB],
+	$in->ask_from_treelist(N("Scanner configuration"), 
+			       ($port && $name ? N("Select a scanner model (Detected model: %s, Port: %s)",
+                                          removeverticalbar($name), $port)
+                         : $name ? N("Select a scanner model (Detected model: %s)", removeverticalbar($name))
+                           : $port ? N("Select a scanner model (Port: %s)", $port) : ""
+                      ),
+			       '|', [' None', map { $_ . if_($scanner::scannerDB->{$_}{flags}{unsupported}, N(" (UNSUPPORTED)")) } keys %$scanner::scannerDB],
 			       '') or return 0;
     return 0 if $s eq ' None';
+    my $unsuppstr = quotemeta(N(" (UNSUPPORTED)"));
+    $s =~ s/$unsuppstr$//;
     if ($scanner::scannerDB->{$s}{flags}{unsupported}) {
-	$in->ask_warn('Scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", removeverticalbar($s)));
+	$in->ask_warn(N("Error"), N("The %s is not supported under Linux.", removeverticalbar($s)));
 	return 0;
     }
     return tryConfScanner($s, $port, $vendor, $product);
 }
 
-sub dynamic {
+sub dynamic() {
     @f = scanner::detect();
     my $name;
     foreach (@f) { 
-	if (member($_->{val}{DESCRIPTION}, keys %$scanner::scannerDB)) {
+	if (exists $scanner::scannerDB->{$_->{val}{DESCRIPTION}}) {
 	    $name = $_->{val}{DESCRIPTION};
 	    $name =~ s/\s$//; #some HP entry have a trailing space, i will correct usbtable asap
-	    if ($scanner::scannerDB->{$name}{flags}{unsupported}) {
-		$in->ask_warn('Scannerdrake', N("The %s is not supported by this version of Mandrake Linux.", removeverticalbar($name)));
-		next;
+	    next if $scanner::scannerDB->{$name}{flags}{unsupported};
+	    if (my @modules = @{$scanner::scannerDB->{$name}{kernel}}) {
+		modules::load(@modules);
+		modules::append_to_modules_loaded_at_startup_for_all_kernels(@modules);
 	    }
 	    scanner::confScanner($name, $_->{port},
-				 $_->{val}{vendor}, $_->{val}{id});
+				 $_->{val}{vendor}, $_->{val}{id}, "");
+	}
+    }
+}
+
+sub installfirmware {
+    my ($model, $backend) = @_;
+    my $firmware;
+    my $choice = N("Do not install firmware file");
+    while (1) {
+	# Tell user about firmware installation
+	$in->ask_from(N("Scanner Firmware"),
+		      N("It is possible that your %s needs its firmware to be uploaded everytime when it is turned on.", removeverticalbar($model)) . " " .
+		      N("If this is the case, you can make this be done automatically.") . " " .
+		      N("To do so, you need to supply the firmware file for your scanner so that it can be installed.") . " " .
+		      N("You find the file on the CD or floppy coming with the scanner, on the manufacturer's home page, or on your Windows partition."),
+		      [
+		       { label => N("Install firmware file from"), 
+			 val => \$choice,
+			 list => [N("CD-ROM"),
+				  N("Floppy Disk"), 
+				  N("Other place"),
+				  N("Do not install firmware file")], 
+			 not_edit => 1, sort => 0 },
+		       ],
+		      ) or return "///";
+	my $dir;
+	if ($choice eq N("CD-ROM")) {
+	    $dir = "/mnt/cdrom";
+	} elsif ($choice eq N("Floppy Disk")) {
+	    $dir = "/mnt/floppy";
+	} elsif ($choice eq N("Other place")) {
+	    $dir = "/mnt";
 	} else {
-	    $in->ask_warn('Scannerdrake', N("The %s is not known by this version of Scannerdrake.", removeverticalbar($name))); 
+	    return "";
 	}
+	# Let user select a firmware file from a floppy, hard disk, ...
+        $firmware = $in->ask_file(N("Select firmware file"), $dir);
+	last if !$firmware || -r $firmware;
+	$in->ask_warn(N("Error"),
+		      N("The firmware file %s does not exist or is unreadable!",
+			$firmware));
+	
     }
+    # Install the firmware file in /usr/share/sane/firmware
+    $firmware = scanner::installfirmware($firmware, $backend);
+    return $firmware;
+}
+
+sub updatefirmware {
+    my (@configured) = @_;
+    my $firmware;
+    my @scanners =
+	map { 
+	    $_->{val}{DESCRIPTION};
+	} grep { 
+	    $_->{val}{FIRMWARELINE};
+	} @configured;
+    my ($scannerchoice, $mediachoice);
+    while (1) {
+	# Tell user about firmware installation
+	$in->ask_from(N("Scanner Firmware"),
+		      ($#scanners > 0 ?
+		       N("It is possible that your scanners need their firmware to be uploaded everytime when they are turned on.") :
+		       N("It is possible that your %s needs its firmware to be uploaded everytime when it is turned on.", $scanners[0])) . " " .
+		      N("If this is the case, you can make this be done automatically.") . " " .
+		      ($#scanners > 0 ?
+		       N("To do so, you need to supply the firmware files for your scanners so that it can be installed.") :
+		       N("To do so, you need to supply the firmware file for your scanner so that it can be installed.")) . " " .
+		       N("You find the file on the CD or floppy coming with the scanner, on the manufacturer's home page, or on your Windows partition.") . "\n" .
+		      N("If you have already installed your scanner's firmware you can update the firmware here by supplying the new firmware file."),
+		      [
+		       { label => N("Install firmware for the"), 
+			 val => \$scannerchoice,
+			 list => \@scanners, 
+			 not_edit => 1, sort => 1 },
+		       { label => N("Install firmware file from"), 
+			 val => \$mediachoice,
+			 list => [N("CD-ROM"),
+				  N("Floppy Disk"), 
+				  N("Other place")], 
+			 not_edit => 1, sort => 0 },
+		       ],
+		      ) or return 0;
+	my $dir;
+	if ($mediachoice eq N("CD-ROM")) {
+	    $dir = "/mnt/cdrom";
+	} elsif ($mediachoice eq N("Floppy Disk")) {
+	    $dir = "/mnt/floppy";
+	} elsif ($mediachoice eq N("Other place")) {
+	    $dir = "/mnt";
+	} else {
+	    return 0;
+	}
+	# Let user select a firmware file from a floppy, hard disk, ...
+        $firmware = $in->ask_file(N("Select firmware file for the %s",
+				    $scannerchoice), $dir);
+	last if !$firmware || -r $firmware;
+	$in->ask_warn(N("Error"),
+		      N("The firmware file %s does not exist or is unreadable!",
+			$firmware));
+	
+    }
+
+    return 0 if !$firmware;
+
+    foreach (@configured) {
+	next if $_->{val}{DESCRIPTION} ne $scannerchoice; 
+	# Install the firmware file in /usr/share/sane/firmware
+	my $backend = $_->{val}{BACKEND};
+	$firmware = scanner::installfirmware($firmware, $backend);
+	if (!$firmware) {
+	    $in->ask_warn('Error',
+			  N("Could not install the firmware file for the %s!",
+			    $scannerchoice));
+	    return 0;
+	}
+	# Enter the path to the firmware in the appropriate config file
+	my $firmwareline = $_->{val}{FIRMWARELINE};
+	$firmwareline =~ s/\$FIRMWARE/$firmware/sg;
+	scanner::setfirmware($backend, $firmwareline);
+	last;
+    }
+
+    # Success message
+    $in->ask_warn(N("Information"),
+		  N("The firmware file for your %s was successfully installed.",
+		    $scannerchoice));
+    
+    return 1;
 }
 
 sub tryConfScanner {
     # take care if interactive output is needed (unsupported, parallel..)
     my ($model, $port, $vendor, $product) = @_;
     if ($scanner::scannerDB->{$model}{flags}{unsupported}) {
-	$in->ask_warn('Scannerdrake', N("The %s is unsupported", 
+	$in->ask_warn(N("Warning"), N("The %s is unsupported", 
 					removeverticalbar($model)));
 	return 0;
     }
+    if ($scanner::scannerDB->{$model}{server} =~ /(printerdrake|hpoj|hpaio|hplip)/i) {
+     	$in->ask_warn(N("Warning"), N("The %s must be configured by system-config-printer.\nYou can launch system-config-printer from the %s Control Center in Hardware section.", removeverticalbar($model), $shortdistroname));
+     	return 0;
+    }
+    my @modules;
+    if (defined($scanner::scannerDB->{$model}{kernel})) {
+	push @modules, @{$scanner::scannerDB->{$model}{kernel}};
+    } elsif (defined($scanner::scannerDB->{$model}{scsikernel}) &&
+	     $scanner::scannerDB->{$model}{driver} =~ /SCSI/i) {
+	push @modules, @{$scanner::scannerDB->{$model}{scsikernel}};
+    } elsif (defined($scanner::scannerDB->{$model}{usbkernel}) &&
+	     $scanner::scannerDB->{$model}{driver} =~ /USB/i) {
+	push @modules, @{$scanner::scannerDB->{$model}{usbkernel}};
+    } elsif (defined($scanner::scannerDB->{$model}{parportkernel}) &&
+	     $scanner::scannerDB->{$model}{driver} =~ /Parport/i)  {
+	push @modules, @{$scanner::scannerDB->{$model}{parportkernel}};
+    }
+    if ($#modules >= 0) {
+	my $wait = $in->wait_message(N("Please wait"),
+				     N("Setting up kernel modules..."));
+	foreach my $m (@modules) {
+	    eval { modules::load($m) };
+	    if (!$@) {
+		modules::append_to_modules_loaded_at_startup_for_all_kernels($m);
+	    }
+	}
+        undef $wait;
+    }
     if ($scanner::scannerDB->{$model}{ask} =~ /DEVICE/ || !$port) {
 	$port ||= N("Auto-detect available ports");
-	$in->ask_from('Scannerdrake',
+	$in->ask_from(N("Device choice"),
 		      N("Please select the device where your %s is attached", removeverticalbar($model)) . " " .
 		      N("(Note: Parallel ports cannot be auto-detected)"),
 		      [
@@ -195,8 +362,8 @@ sub tryConfScanner {
 		       ],
 		      ) or return 0;
 	if ($port eq N("Auto-detect available ports")) {
-	    $wait = $in->wait_message(N("Scannerdrake"),
-				      N("Searching for scanners ..."));
+	    $wait = $in->wait_message(N("Please wait"),
+				      N("Searching for scanners..."));
 	    my @d = scanner::detect();
 	    undef $wait;
 	    my @list = map {
@@ -204,7 +371,7 @@ sub tryConfScanner {
 		    removeverticalbar($_->{val}{DESCRIPTION}) . ")";
 	    } @d;
 	    $port ||= $list[0];
-	    $in->ask_from('Scannerdrake',
+	    $in->ask_from(N("Device choice"),
 			  N("Please select the device where your %s is attached", removeverticalbar($model)),
 			  [
 			   { label => N("choose device"), 
@@ -223,17 +390,37 @@ sub tryConfScanner {
 	}
     }
     ($vendor, $product) = scanner::get_usb_ids_for_port($port);
-    if ($scanner::scannerDB->{$model}{server} =~ /(printerdrake|hpoj)/i) {
-     	$in->ask_warn('Scannerdrake', N("The %s must be configured by printerdrake.\nYou can launch printerdrake from the Mandrake Control Center in Hardware section.", removeverticalbar($model)));
-     	return 0;
+    my $firmware;
+    my $server = $scanner::scannerDB->{$model}{server};
+    if (any { /FIRMWARELINE/ } @{$scanner::scannerDB->{$model}{lines}}) {
+	$firmware = installfirmware($model, $server);
+	return 0 if $firmware eq "///";
+    }
+    scanner::confScanner($model, $port, $vendor, $product, $firmware);
+    if ($scanner::scannerDB->{$model}{flags}{manual} == 2) {
+	# MANUALREQUIRED in ScannerDB
+	$in->ask_warn(N("Attention!"),
+		      N("Your %s cannot be configured fully automatically.\n\nManual adjustments are required. Please edit the configuration file /etc/sane.d/%s.conf. ", removeverticalbar($model), $server) .
+		      N("More info in the driver's manual page. Run the command \"man sane-%s\" to read it.", $server) .
+		      "\n\n" .
+		      N("After that you may scan documents using \"XSane\" or \"%s\" from Multimedia/Graphics in the applications menu.", "Skanlite"));
+    } elsif ($scanner::scannerDB->{$model}{flags}{manual} == 1) {
+	# MANUAL in ScannerDB
+	$in->ask_warn(N("Attention!"),
+		      N("Your %s has been configured, but it is possible that additional manual adjustments are needed to get it to work. ", removeverticalbar($model)) .
+		      N("If it does not appear in the list of configured scanners in the main window of Scannerdrake or if it does not work correctly, ") .
+		      N("edit the configuration file /etc/sane.d/%s.conf. ", $server) .
+		      N("More info in the driver's manual page. Run the command \"man sane-%s\" to read it.", $server) .
+		      "\n\n" .
+		      N("After that you may scan documents using \"XSane\" or \"%s\" from Multimedia/Graphics in the applications menu.", "Skanlite"));
+    } else {
+	$in->ask_warn(N("Congratulations!"),
+		      N("Your %s has been configured.\nYou may now scan documents using \"XSane\" or \"%s\" from Multimedia/Graphics in the applications menu.", removeverticalbar($model), "Skanlite"));
     }
-    scanner::confScanner($model, $port, $vendor, $product);
-    $in->ask_warn(N("Congratulations!"),
-		  N("Your %s has been configured.\nYou may now scan documents using \"XSane\" from Multimedia/Graphics in the applications menu.", removeverticalbar($model)));
     return 1;
 }
 
-sub quit {
+sub quit() {
     $in->exit(0);
 }
 
@@ -251,11 +438,10 @@ sub mainwindow {
 			if_($entry, "  -  $entry\n");
 		    } @configured;
 		if (@scannerlist) {
-		    my $main_msg = 
-			@scannerlist > 1 ?
-			N_("The following scanners\n\n%s\nare available on your system.\n") :
-			N_("The following scanner\n\n%s\nis available on your system.\n");
-		    sprintf($main_msg, join('', @scannerlist));
+                    my $list = join('', @scannerlist);
+                    @scannerlist > 1 ?
+                      N("The following scanners\n\n%s\nare available on your system.\n", $list) :
+                      N("The following scanner\n\n%s\nis available on your system.\n", $list);
 		} else {
 		    N("There are no scanners found which are available on your system.\n");
 		}
@@ -268,7 +454,7 @@ sub mainwindow {
 	if ($in->ask_from_
 	    (
 	     { 
-		 title => N("Scannerdrake"),
+		 title => N("Scanner Management"),
 		 messages => $msg,
 		 ok => "",
 		 cancel => "",
@@ -286,6 +472,13 @@ sub mainwindow {
 		    $buttonclicked = "manualadd";
 		    1;
 		} },
+	      ((any { $_->{val}{FIRMWARELINE} } @configured) ?
+		{ val => N("Install/Update firmware files"),
+		  type => 'button',
+		  clicked_may_quit => sub {
+		      $buttonclicked = "firmware";
+		      1;
+		  } } : ()),
 	      { val => N("Scanner sharing"),
 		type => 'button',
 		clicked_may_quit => sub {
@@ -305,14 +498,14 @@ sub mainwindow {
 	    if ($buttonclicked eq "autoadd") {
 		# Do scanner auto-detection
 		my $wait =
-		    $in->wait_message(N("Scannerdrake"),
-				      N("Searching for configured scanners ..."));
-		@configured = scanner::configured();
+		    $in->wait_message(N("Please wait"),
+				      N("Searching for configured scanners..."));
+		@configured = scanner::configured($in);
 		$wait = 
-		    $in->wait_message(N("Scannerdrake"),
-				      N("Searching for new scanners ..."));
+		    $in->wait_message(N("Please wait"),
+				      N("Searching for new scanners..."));
 		my @f = scanner::detect(@configured);
-		$wait = undef;
+		undef $wait;
 		if (@f) { 
 		    $changed = auto();
 		}
@@ -322,15 +515,18 @@ sub mainwindow {
 	    } elsif ($buttonclicked eq "sharing") {
 		# Show dialog to set up scanner sharing
 		$changed = sharewindow(@configured);
+	    } elsif ($buttonclicked eq "firmware") {
+		# Show dialog to select the firmware file
+		updatefirmware(@configured);
 	    } elsif ($buttonclicked eq "quit") {
 		# We have clicked "Quit"
 		$maindone = 1;
 	    }
 	    if ($changed) {
-		my $wait =
-		    $in->wait_message(N("Scannerdrake"),
-				      N("Re-generating list of configured scanners ..."));
-		@configured = scanner::configured();
+		my $_wait =
+		    $in->wait_message(N("Please wait"),
+				      N("Re-generating list of configured scanners..."));
+		@configured = scanner::configured($in);
 	    }
 	} else {
 	    # Cancel clicked
@@ -345,7 +541,7 @@ sub makeexportmenues {
 	($_ eq '+' ? N("All remote machines") : $_) => $_;
     } map {
 	# Remove comments and blank lines
-	(/^\s*($|\#)/ ? () : chomp_($_));
+	(/^\s*($|#)/ ? () : chomp_($_));
     } @exports;
     my %menuexports_inv = reverse %menuexports;
     return (\%menuexports, \%menuexports_inv);
@@ -357,14 +553,14 @@ sub makeimportmenues {
 	($_ eq 'localhost' ? N("This machine") : $_) => $_;
     } map {
 	# Remove comments and blank lines
-	if_(!/^\s*($|\#)/, chomp_($_));
+	if_(!/^\s*($|#)/, chomp_($_));
     } @imports;
     my %menuimports_inv = reverse %menuimports;
     return (\%menuimports, \%menuimports_inv);
 }
 
 sub sharewindow {
-    my @configured = @_;
+    my @_configured = @_;
     # Read list of hosts to where to export the local scanners
     my @exports = cat_("/etc/sane.d/saned.conf");
     my ($menuexports, $menuexports_inv) =
@@ -374,10 +570,10 @@ sub sharewindow {
     my ($menuimports, $menuimports_inv) =
 	makeimportmenues(@imports);
     # Is saned running?
-    my $sanedrunning = services::starts_on_boot("saned");
+    my $sanedrunning = services::starts_on_boot("saned.socket");
     my $oldsanedrunning = $sanedrunning;
     # Is the "net" SANE backend active
-    my $netbackendactive = grep { /^\s*net\s*$/ }
+    my $netbackendactive = find { /^\s*net\s*$/ }
       cat_("/etc/sane.d/dll.conf");
     my $oldnetbackendactive = $netbackendactive;
     # Set this to 1 to tell the caller that the list of locally available
@@ -393,18 +589,18 @@ sub sharewindow {
 	if ($in->ask_from_
 	    (
 	     { 
-		 title => N("Scannerdrake"),
-		 messages => N("Here you can choose whether the scanners connected to this machine should be accessable by remote machines and by which remote machines.") .
+		 title => N("Scanner Sharing"),
+		 messages => N("Here you can choose whether the scanners connected to this machine should be accessible by remote machines and by which remote machines.") .
                      N("You can also decide here whether scanners on remote machines should be made available on this machine."),
 	     },
 	     [
 	      { text => N("The scanners on this machine are available to other computers"), type => 'bool',
 		val => \$sanedrunning },
 	      { val => N("Scanner sharing to hosts: ") .
-		    (keys %{$menuexports} > 0 ?
-		     (keys %{$menuexports} > 2 ?
-		      join(", ", (keys %{$menuexports})[0,1]) . " ..." :
-		      join(", ", keys %{$menuexports})) :
+		    (keys %$menuexports > 0 ?
+		     (keys %$menuexports > 2 ?
+		      join(", ", (keys %$menuexports)[0,1]) . " ..." :
+		      join(", ", keys %$menuexports)) :
 		     N("No remote machines")), 
 		type => 'button',
 		clicked_may_quit => sub {
@@ -418,10 +614,10 @@ sub sharewindow {
 		type => 'bool',
 		val => \$netbackendactive },
 	      { val => N("Use the scanners on hosts: ") .
-		    (keys %{$menuimports} > 0 ?
-		     (keys %{$menuimports} > 2 ?
-		      join(", ", (keys %{$menuimports})[0,1]) . " ..." :
-		      join(", ", keys %{$menuimports})) :
+		    (keys %$menuimports > 0 ?
+		     (keys %$menuimports > 2 ?
+		      join(", ", (keys %$menuimports)[0,1]) . " ..." :
+		      join(", ", keys %$menuimports)) :
 		     N("No remote machines")), 
 		type => 'button',
 		clicked_may_quit => sub {
@@ -439,7 +635,7 @@ sub sharewindow {
 		my $subdone = 0;
 		my $choice;
 		while (!$subdone) {
-		    my @list = keys %{$menuexports};
+		    my @list = keys %$menuexports;
 		    # Entry should be edited when double-clicked
 		    $buttonclicked = "edit";
 		    $in->ask_from_
@@ -469,7 +665,7 @@ sub sharewindow {
 				 1; 
 			     },
 			     disabled => sub {
-				 return ($#list < 0);
+				 return $#list < 0;
 			     } },
 			   { val => N("Remove selected host"), 
 			     type => 'button',
@@ -478,7 +674,7 @@ sub sharewindow {
 				 1; 
 			     },
 			     disabled => sub {
-				 return ($#list < 0);
+				 return $#list < 0;
 			     } },
 			   { val => N("Done"), 
 			     type => 'button',
@@ -527,7 +723,7 @@ sub sharewindow {
 				       }
 				       # Do not allow an empty address
 				       if ($address !~ /\S/) {
-					   $in->ask_warn(N("Scannerdrake"), 
+					   $in->ask_warn(N("Error"), 
 							 N("You must enter a host name or an IP address.\n"));
 					   return (1,0);
 				       }
@@ -538,7 +734,7 @@ sub sharewindow {
 				       if ($address ne $oldaddress &&
 					   member("$address\n",
 						   @exports)) {
-					   $in->ask_warn(N("Scannerdrake"), 
+					   $in->ask_warn(N("Error"), 
 							 N("This host is already in the list, it cannot be added again.\n"));
 					   return (1,1);
 				       }
@@ -589,7 +785,7 @@ sub sharewindow {
 		my $subdone = 0;
 		my $choice;
 		while (!$subdone) {
-		    my @list = keys %{$menuimports};
+		    my @list = keys %$menuimports;
 		    # Entry should be edited when double-clicked
 		    $buttonclicked = "edit";
 		    $in->ask_from_
@@ -619,7 +815,7 @@ sub sharewindow {
 				 1; 
 			     },
 			     disabled => sub {
-				 return ($#list < 0);
+				 return $#list < 0;
 			     } },
 			   { val => N("Remove selected host"), 
 			     type => 'button',
@@ -628,7 +824,7 @@ sub sharewindow {
 				 1; 
 			     },
 			     disabled => sub {
-				 return ($#list < 0);
+				 return $#list < 0;
 			     } },
 			   { val => N("Done"), 
 			     type => 'button',
@@ -677,7 +873,7 @@ sub sharewindow {
 				       }
 				       # Do not allow an empty address
 				       if ($address !~ /\S/) {
-					   $in->ask_warn(N("Scannerdrake"), 
+					   $in->ask_warn(N("Error"), 
 							 N("You must enter a host name or an IP address.\n"));
 					   return (1,0);
 				       }
@@ -688,7 +884,7 @@ sub sharewindow {
 				       if ($address ne $oldaddress &&
 					   member("$address\n",
 						   @imports)) {
-					   $in->ask_warn(N("Scannerdrake"), 
+					   $in->ask_warn(N("Error"), 
 							 N("This host is already in the list, it cannot be added again.\n"));
 					   return (1,1);
 				       }
@@ -748,22 +944,26 @@ sub sharewindow {
 		# Turn on/off saned
 		if ($sanedrunning != $oldsanedrunning) {
 		    if ($sanedrunning) {
-			# Make sure saned and xinetd is installed and 
-			# running
-			if (!files_exist('/usr/sbin/xinetd',
-					 '/usr/sbin/saned')) {
-			    $in->do_pkgs->install('xinetd', 'saned');
+			# Make sure saned is installed and running
+			if (!files_exist('/usr/sbin/saned')) {
+			    if (!$in->ask_yesorno(N("Warning"), N("saned needs to be installed to share the local scanner(s).
+
+Do you want to install the saned package?"))) {
+				$in->ask_warn("Warning", 
+					      N("Your scanner(s) will not be available on the network."));
+			    } elsif (!$in->do_pkgs->install('saned')) {
+				$in->ask_warn(N("Error"),
+					      N("Could not install the packages needed to share your scanner(s).") . " " .
+					      N("Your scanner(s) will not be available on the network."));
+			    }
 			}
 			# Start saned and make sure that it gets started on
 			# every boot
-			services::start_service_on_boot("saned");
-			services::start_service_on_boot("xinetd");
-			services::restart("xinetd");
+			services::enable("saned.socket");
 		    } else {
 			# Stop saned and make sure that it does not get
 			# started when booting
-			services::do_not_start_service_on_boot("saned");
-			services::restart("xinetd");
+			services::disable("saned.socket");
 		    }
 		}
 		# Turn on/off "net" SANE backend