diff options
Diffstat (limited to 'perl-install/standalone/scannerdrake')
| -rwxr-xr-x | perl-install/standalone/scannerdrake | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index da7376813..947c4c086 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -1,6 +1,5 @@ #!/usr/bin/perl -# scannerdrake $Id: scannerdrake 250480 2008-12-15 14:28:46Z tv $ # Yves Duret # Till Kamppeter # Copyright (C) 2001-2008 Mandriva @@ -39,7 +38,7 @@ foreach (@ARGV) { /^--dynamic=(.*)$/ and do { dynamic(); exit() }; } -$ugtk2::wm_icon = "scannerdrake"; +$ugtk3::wm_icon = "scannerdrake"; my $in = 'interactive'->vnew('su'); if (!files_exist(qw(/usr/bin/scanimage /etc/sane.d/dll.conf)) || @@ -322,6 +321,7 @@ sub tryConfScanner { 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"); @@ -505,7 +505,7 @@ sub mainwindow { $in->wait_message(N("Please wait"), N("Searching for new scanners...")); my @f = scanner::detect(@configured); - $wait = undef; + undef $wait; if (@f) { $changed = auto(); } @@ -570,7 +570,7 @@ 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 = find { /^\s*net\s*$/ } @@ -944,16 +944,14 @@ 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')) { + # 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('xinetd', 'saned')) { + } 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.")); @@ -961,14 +959,11 @@ Do you want to install the saned package?"))) { } # 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 |