summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-05-13 08:10:00 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-06-06 06:29:08 +0200
commitce6a2d0038e53f2d525c96b44fd11e88859a9d9e (patch)
treeadf8943fad41265362013c657556b5fc40294d5a
parentf1b22a33da057579bf777aed55189969353703c0 (diff)
downloaddrakx-ce6a2d0038e53f2d525c96b44fd11e88859a9d9e.tar
drakx-ce6a2d0038e53f2d525c96b44fd11e88859a9d9e.tar.gz
drakx-ce6a2d0038e53f2d525c96b44fd11e88859a9d9e.tar.bz2
drakx-ce6a2d0038e53f2d525c96b44fd11e88859a9d9e.tar.xz
drakx-ce6a2d0038e53f2d525c96b44fd11e88859a9d9e.zip
kill the now useless mouse options
also kill the ‘wacom _dev’ option which is useless since commit 7fcb6cc30e6264865a66551a2ab9cca3dc089c64 more than 10 years ago
-rw-r--r--perl-install/install/gtk.pm2
-rw-r--r--perl-install/install/steps_gtk.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install/gtk.pm b/perl-install/install/gtk.pm
index 42a331084..a4479a21b 100644
--- a/perl-install/install/gtk.pm
+++ b/perl-install/install/gtk.pm
@@ -247,7 +247,7 @@ sub special_shortcuts {
#------------------------------------------------------------------------------
sub createXconf {
- my ($file, $mouse_type, $mouse_dev, $_wacom_dev, $Driver) = @_;
+ my ($file, $Driver) = @_;
symlinkf(devices::make($mouse_dev), "/dev/mouse") if $mouse_dev ne 'none';
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index 140f146ed..04fdce954 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -111,7 +111,7 @@ sub _launchX {
if ($server eq 'Xnest') {
push @options, '-ac', '-geometry', $o->{vga} || ($o->{vga16} ? '640x480' : '800x600');
} else {
- install::gtk::createXconf($f, @{$o->{mouse}}{'Protocol', 'device'}, $o->{mouse}{wacom}[0], $Driver);
+ install::gtk::createXconf($f, $Driver);
push @options, '-allowMouseOpenFail', '-xf86config', $f;
push @options, 'vt7', '-dpi', '75';