1 files changed, 9 insertions, 13 deletions

diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 78dac5207..09508e280 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -41,6 +41,7 @@ foreach (@ARGV) {
     /^--dynamic=(.*)$/ and do { dynamic(); exit() };
 }
 
+$ugtk2::wm_icon = "scannerdrake";
 my $in = 'interactive'->vnew('su');
 if (!files_exist(qw(/usr/bin/scanimage
 		    /etc/sane.d/dll.conf)) ||
@@ -63,11 +64,11 @@ Do you want to install the SANE packages?"))) {
 }
 if ($::Manual) { manual(); quit() }
 my $wait = $in->wait_message(N("Scannerdrake"),
-			     N("Searching for configured scanners ..."));
+			     N("Searching for configured scanners..."));
 my @c = scanner::configured();
 $wait = undef;
 $wait = $in->wait_message(N("Scannerdrake"),
-			     N("Searching for new scanners ..."));
+			     N("Searching for new scanners..."));
 my @f = scanner::detect(@c);
 $wait = undef;
 my $changed = 0;
@@ -75,7 +76,7 @@ my $changed = 0;
 if ($changed) {
     my $_wait =
 	$in->wait_message(N("Scannerdrake"),
-			  N("Re-generating list of configured scanners ..."));
+			  N("Re-generating list of configured scanners..."));
     @c = scanner::configured();
 }
 mainwindow(@c);
@@ -151,14 +152,9 @@ sub dynamic() {
 	if (member($_->{val}{DESCRIPTION}, keys %$scanner::scannerDB)) {
 	    $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 %s.", removeverticalbar($name), $distroname));
-		next;
-	    }
+	    next if ($scanner::scannerDB->{$name}{flags}{unsupported});
 	    scanner::confScanner($name, $_->{port},
 				 $_->{val}{vendor}, $_->{val}{id}, "");
-	} else {
-	    $in->ask_warn('Scannerdrake', N("The %s is not known by this version of Scannerdrake.", removeverticalbar($name))); 
 	}
     }
 }
@@ -342,7 +338,7 @@ sub tryConfScanner {
 		      ) or return 0;
 	if ($port eq N("Auto-detect available ports")) {
 	    $wait = $in->wait_message(N("Scannerdrake"),
-				      N("Searching for scanners ..."));
+				      N("Searching for scanners..."));
 	    my @d = scanner::detect();
 	    undef $wait;
 	    my @list = map {
@@ -461,11 +457,11 @@ sub mainwindow {
 		# Do scanner auto-detection
 		my $wait =
 		    $in->wait_message(N("Scannerdrake"),
-				      N("Searching for configured scanners ..."));
+				      N("Searching for configured scanners..."));
 		@configured = scanner::configured();
 		$wait = 
 		    $in->wait_message(N("Scannerdrake"),
-				      N("Searching for new scanners ..."));
+				      N("Searching for new scanners..."));
 		my @f = scanner::detect(@configured);
 		$wait = undef;
 		if (@f) { 
@@ -487,7 +483,7 @@ sub mainwindow {
 	    if ($changed) {
 		my $_wait =
 		    $in->wait_message(N("Scannerdrake"),
-				      N("Re-generating list of configured scanners ..."));
+				      N("Re-generating list of configured scanners..."));
 		@configured = scanner::configured();
 	    }
 	} else {