summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-07 07:27:17 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-07 07:27:17 +0000
commitd7196052710e22b1d20a179f86147d9c8c65bf7a (patch)
tree9bac7028c1963e7b3367c6c14b48b0a9543a8285 /perl-install
parentae63f34b88a2ae8792bb00c408a321ce97ed0c83 (diff)
downloaddrakx-d7196052710e22b1d20a179f86147d9c8c65bf7a.tar
drakx-d7196052710e22b1d20a179f86147d9c8c65bf7a.tar.gz
drakx-d7196052710e22b1d20a179f86147d9c8c65bf7a.tar.bz2
drakx-d7196052710e22b1d20a179f86147d9c8c65bf7a.tar.xz
drakx-d7196052710e22b1d20a179f86147d9c8c65bf7a.zip
more synaptics fixes
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/mouse.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 8d8884009..52614e10a 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -355,7 +355,7 @@ sub load_modules {
/ttyS/ and push @l, qw(serial);
/event/ and push @l, qw(wacom evdev);
}
- if (member(N_("Synaptics Touchpad"), $mouse->{name}, $mouse->{auxmouse}{name})) {
+ if (member(N_("Synaptics Touchpad"), $mouse->{name}, $mouse->{auxmouse} && $mouse->{auxmouse}{name})) {
push @l, qw(evdev);
}
eval { modules::load(@l) };
@@ -365,8 +365,8 @@ sub set_xfree_conf {
my ($mouse, $xfree_conf, $b_keep_auxmouse_unchanged) = @_;
my ($synaptics, $mouse_) = partition { $_->{name} eq N_("Synaptics Touchpad") }
- ($mouse, if_(!is_empty_hash_ref($mouse->{auxmouse}), $mouse->{auxmouse}));
- undef $mouse->{auxmouse} if $synaptics && $synaptics == $mouse->{auxmouse};
+ ($mouse, if_($mouse->{auxmouse}, $mouse->{auxmouse}));
+ delete $mouse->{auxmouse} if $synaptics && $synaptics == $mouse->{auxmouse};
my @mice = map {
{
Protocol => $_->{XMOUSETYPE},
@@ -391,7 +391,7 @@ sub set_xfree_conf {
$synaptics and $xfree_conf->set_synaptics(map { {
Device => "/dev/$_->{device}",
Protocol => $_->{XMOUSETYPE},
- Primary => $_ ne $mouse->{auxmouse},
+ Primary => $_ != $mouse->{auxmouse},
} } @$synaptics);
}
@@ -416,7 +416,7 @@ sub various_xfree_conf {
}
}
- if (member(N_("Synaptics Touchpad"), $mouse->{name}, $mouse->{auxmouse}{name})) {
+ if (member(N_("Synaptics Touchpad"), $mouse->{name}, $mouse->{auxmouse} && $mouse->{auxmouse}{name})) {
$do_pkgs->install("synaptics");
}
}