diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-04-19 12:27:06 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-04-19 12:27:06 +0000 |
| commit | c5dbe312725926f2a7fd00d0dcee65f4996353f3 (patch) | |
| tree | 9f094d8450334a00d3f06877f41032ff695a461f | |
| parent | 8f1d0153bac6493b6c5de63b940bb6219d9087ab (diff) | |
| download | drakx-backup-do-not-use-c5dbe312725926f2a7fd00d0dcee65f4996353f3.tar drakx-backup-do-not-use-c5dbe312725926f2a7fd00d0dcee65f4996353f3.tar.gz drakx-backup-do-not-use-c5dbe312725926f2a7fd00d0dcee65f4996353f3.tar.bz2 drakx-backup-do-not-use-c5dbe312725926f2a7fd00d0dcee65f4996353f3.tar.xz drakx-backup-do-not-use-c5dbe312725926f2a7fd00d0dcee65f4996353f3.zip | |
using same mouse for alternate_install should be useless
remove it for xbox controller, thus making this option obsolete
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/mouse.pm | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index fc6648283..16fe7bef4 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -47,9 +47,7 @@ sub new($$) { if ($server eq 'Xnest') { push @options, '-ac', '-geometry', $o->{vga} || ($o->{vga16} ? '640x480' : '800x600'); } elsif ($::globetrotter || !$::move) { - #- use alternate mouse in install if mouse is unsafe or needs some specific module (e.g. synaptics) - my $mouse = is_empty_hash_ref($o->{mouse}{alternate_install}) ? $o->{mouse} : $o->{mouse}{alternate_install}; - install_gtk::createXconf($f, @$mouse{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0], $Driver); + install_gtk::createXconf($f, @{$o->{mouse}}{"XMOUSETYPE", "device"}, $o->{mouse}{wacom}[0], $Driver); push @options, if_(!$::globetrotter, '-kb'), '-allowMouseOpenFail', '-xf86config', $f if arch() !~ /^sparc/; push @options, 'tty7', '-dpms', '-s', '240'; diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 20d23f58f..52b653beb 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -291,7 +291,7 @@ sub detect { $modules_conf->get_probeall("usb-interface") and eval { modules::load('usbhid') }; if (my $mouse_nb = scalar grep { /^H: Handlers=mouse/ } cat_('/proc/bus/input/devices')) { if (is_xbox()) { - return fullname2mouse('Universal|Microsoft Xbox Controller S', if_($::isInstall, alternate_install => fullname2mouse('Universal|Microsoft Xbox Controller S'))); + return fullname2mouse('Universal|Microsoft Xbox Controller S'); } my $univ_mouse = fullname2mouse('Universal|Any PS/2 & USB mice', wacom => \@wacom); if (my ($synaptics_touchpad) = detect_devices::getSynapticsTouchpads()) { |