summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2008-12-10 09:22:33 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2008-12-15 09:32:00 +1000
commitb3bf47cf8ac5d24e3358c937d7456570378ceb6e (patch)
tree672df26061eabc011dd14ffe6bc126a00850dc9a
parent3db3f4e04c7038477a03b092c55dfd063224f034 (diff)
Fix compilation issue (opts undeclared) for XINPUT ABI 0. (#18988)
HistorySize is now deprecated for ABI > 0, so list it as a removed option in the man page. X.Org Bug 18988 <http://bugs.freedesktop.org/show_bug.cgi?id=18988> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Christoph Brill <egore911@egore911.de> Signed-off-by: Henrik Rydberg <rydberg@euromail.se> (cherry picked from commit 8d5cf39e7f37ce78aaec423a9da397d72b1629d2)
-rw-r--r--man/synaptics.man2
-rw-r--r--src/synaptics.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/man/synaptics.man b/man/synaptics.man
index 0030680..aaa448c 100644
--- a/man/synaptics.man
+++ b/man/synaptics.man
@@ -634,6 +634,8 @@ edge scrolling is enabled for both horizontal and vertical scrolling.
The following options are no longer part of the driver configuration:
.TP
.BI "Option \*qRepeater\*q \*q" string \*q
+.TP
+.BI "Option \*qHistorySize\*q \*q" integer \*q
.SH "AUTHORS"
.LP
diff --git a/src/synaptics.c b/src/synaptics.c
index 8ccfb69..664d2fa 100644
--- a/src/synaptics.c
+++ b/src/synaptics.c
@@ -595,7 +595,7 @@ SynapticsPreInit(InputDriverPtr drv, IDevPtr dev, int flags)
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
- local->history_size = xf86SetIntOption(opts, "HistorySize", 0);
+ local->history_size = xf86SetIntOption(local->options, "HistorySize", 0);
#endif
xf86ProcessCommonOptions(local, local->options);