From 93512bcbb9b34babfb2c97385f48e81936a1b625 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 3 Sep 2001 09:25:52 +0000
Subject: make sure a staling Mouse2 is not present unless it really physically
 exists.

---
 perl-install/Xconfig.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/perl-install/Xconfig.pm b/perl-install/Xconfig.pm
index 5d8652ab5..836fa27c5 100644
--- a/perl-install/Xconfig.pm
+++ b/perl-install/Xconfig.pm
@@ -165,11 +165,11 @@ sub getinfoFromXF86Config {
     $mouse{auxmouse}{nbuttons} ||= 3;
     mouse::update_type_name(\%mouse); #- allow getting fullname (type|name).
     mouse::update_type_name($mouse{auxmouse});
+    delete $mouse{auxmouse} unless $mouse{auxmouse}{XMOUSETYPE}; #- only take care of a true mouse.
 
     #- try to merge with $o, the previous has been obtained by ddcxinfos.
     add2hash($o->{keyboard} ||= {}, \%keyboard);
     add2hash($o->{mouse} ||= {}, \%mouse);
-    add2hash($o->{mouse}{auxmouse} ||= {}, $mouse{auxmouse}) if $mouse{auxmouse}{XMOUSETYPE};
     @{$o->{wacom} || []} > 0 or $o->{wacom} = [ keys %wacom ];
     add2hash($o->{monitor} ||= {}, \%monitor);
 
-- 
cgit v1.2.1