summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-02-12 10:15:16 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-02-12 10:15:16 +0000
commit84faa514aad2eb07791905fb15f5f3b42431a501 (patch)
treeb6e7c2464b22f71bfbe4b3e3ea49dc8533448a18
parentda02aa49da159a69643449d28609e128fe07937f (diff)
downloaddrakx-84faa514aad2eb07791905fb15f5f3b42431a501.tar
drakx-84faa514aad2eb07791905fb15f5f3b42431a501.tar.gz
drakx-84faa514aad2eb07791905fb15f5f3b42431a501.tar.bz2
drakx-84faa514aad2eb07791905fb15f5f3b42431a501.tar.xz
drakx-84faa514aad2eb07791905fb15f5f3b42431a501.zip
always use fast_mouse_probe (probing serial is now mostly deprecated, and it
is *re-done* by drakconnect, so no need to do it soon)
-rw-r--r--perl-install/mouse.pm12
1 files changed, 2 insertions, 10 deletions
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index ab1d1ac42..4f74fcccf 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -299,11 +299,8 @@ sub detect() {
log::l("no usb interface found for wacom");
}
- #- at this level, not all possible mice are detected so avoid invoking serial_probe
- #- which takes a while for its probe.
- if ($::isStandalone || $::move) {
- my $mouse = $fast_mouse_probe->();
- $mouse and return { wacom => \@wacom, %$mouse };
+ if (my $mouse = $fast_mouse_probe->()) {
+ return { wacom => \@wacom, %$mouse };
}
#- probe serial device to make sure a wacom has been detected.
@@ -311,11 +308,6 @@ sub detect() {
my ($r, @serial_wacom) = mouseconfig(); push @wacom, @serial_wacom;
$r and return { wacom => \@wacom, %$r };
- if (!$::isStandalone && !$::move) {
- my $mouse = $fast_mouse_probe->();
- $mouse and return { wacom => \@wacom, %$mouse };
- }
-
#- in case only a wacom has been found, assume an inexistant mouse (necessary).
@wacom and return fullname2mouse('none|No mouse', wacom => \@wacom);