From 3ccb7a706f6977fb9b0631e64bfc705299766981 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Fri, 3 Sep 2004 08:38:23 +0000
Subject: (set_xfree_conf) synaptics fixes

---
 perl-install/mouse.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install/mouse.pm')

diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm
index 79ca7a024..2478cc871 100644
--- a/perl-install/mouse.pm
+++ b/perl-install/mouse.pm
@@ -365,7 +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}) ]};
+      ($mouse, if_(!is_empty_hash_ref($mouse->{auxmouse}), $mouse->{auxmouse}));
+    undef $mouse->{auxmouse} if ($synaptics && $synaptics == $mouse->{auxmouse});
     my @mice = map {
 	{
 	    Protocol => $_->{XMOUSETYPE},
@@ -375,7 +376,7 @@ sub set_xfree_conf {
 	    if_($_->{EMULATEWHEEL}, Emulate3Buttons => undef, Emulate3Timeout => 50, EmulateWheel => undef, EmulateWheelButton => 2),
 	};
     } @$mouse_;
-    
+
     if (!$mouse->{auxmouse} && $b_keep_auxmouse_unchanged) {
 	my (undef, @l) = $xfree_conf->get_mice;
 	push @mice, @l;
-- 
cgit v1.2.1