summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-12-14 16:35:43 +0000
committerOlivier Blin <oblin@mandriva.com>2007-12-14 16:35:43 +0000
commit8735090e30191359b7bea7e754017d925055a7aa (patch)
tree265350a72e739f84750b8b1d288a75b3065e4af2
parentc588522a4714865843d46c531ab519aa656ca448 (diff)
downloaddrakx-kbd-mouse-x11-8735090e30191359b7bea7e754017d925055a7aa.tar
drakx-kbd-mouse-x11-8735090e30191359b7bea7e754017d925055a7aa.tar.gz
drakx-kbd-mouse-x11-8735090e30191359b7bea7e754017d925055a7aa.tar.bz2
drakx-kbd-mouse-x11-8735090e30191359b7bea7e754017d925055a7aa.tar.xz
drakx-kbd-mouse-x11-8735090e30191359b7bea7e754017d925055a7aa.zip
drop unused Primary option in set_synaptics
-rw-r--r--lib/Xconfig/xfree.pm3
-rw-r--r--lib/mouse.pm5
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index dfa4d5a..d7abba8 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -313,7 +313,6 @@ sub set_synaptics {
each_index {
my $synaptics_mouse = $_;
my $identifier = "SynapticsMouse" . ($::i + 1);
- my $pointer_type = $synaptics_mouse->{Primary} ? "CorePointer" : "AlwaysCore";
my $h = {
Identifier => { val => $identifier },
Driver => { val => "synaptics" },
@@ -347,7 +346,7 @@ sub set_synaptics {
$h->{$k} = { val => $v, Option => 1 };
}
$raw_X->add_Section('InputDevice', $h);
- push @$layout, { val => qq("$identifier" "$pointer_type") };
+ push @$layout, { val => qq("$identifier" "AlwaysCore") };
} @synaptics;
}
diff --git a/lib/mouse.pm b/lib/mouse.pm
index 8df14c1..39e5564 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -420,10 +420,7 @@ sub set_xfree_conf {
$xfree_conf->set_wacoms(map { { Device => "/dev/$_", USB => to_bool(m|input/by-path/event|) } } @wacoms);
}
- $xfree_conf->set_synaptics({
- Primary => 0,
- ALPS => $mouse->{synaptics}{ALPS},
- }) if $mouse->{synaptics};
+ $xfree_conf->set_synaptics({ ALPS => $mouse->{synaptics}{ALPS} }) if $mouse->{synaptics};
}
sub various_xfree_conf {