summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-09-03 09:25:52 +0000
committerFrancois Pons <fpons@mandriva.com>2001-09-03 09:25:52 +0000
commit93512bcbb9b34babfb2c97385f48e81936a1b625 (patch)
treee5da4d82a6358e5c2b600f81fc14db311e89cb5d
parente9e30736048fc25539f6e662247121a0550992a1 (diff)
downloaddrakx-93512bcbb9b34babfb2c97385f48e81936a1b625.tar
drakx-93512bcbb9b34babfb2c97385f48e81936a1b625.tar.gz
drakx-93512bcbb9b34babfb2c97385f48e81936a1b625.tar.bz2
drakx-93512bcbb9b34babfb2c97385f48e81936a1b625.tar.xz
drakx-93512bcbb9b34babfb2c97385f48e81936a1b625.zip
make sure a staling Mouse2 is not present unless it really physically exists.
-rw-r--r--perl-install/Xconfig.pm2
1 files changed, 1 insertions, 1 deletions
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);