backporting evdev third button emulation patch

[Peter Hutterer]

On Sun, Oct 30, 2011 at 11:22:26PM +0000, Jools Wills wrote:
> On 30/10/11 22:51, Peter Hutterer wrote:
> 
> > yes, thanks. can you please reply to this email with your Signed-off-by tag?
> > I can push it once I have that (see also
> > http://wiki.x.org/wiki/Development/Documentation/SubmittingPatches for what
> > this means)
> 
> I hope I did this right :)
> 
> CC'd to xorg-devel list
> 
> Best Regards

pushed, thanks. I reworded the commit message to fit onto one line, patch
unchanged otherwise

Cheers,
  Peter

> From b6f1d45f4662feddd96926964c3a852b460b1883 Mon Sep 17 00:00:00 2001
> From: Jools Wills <jools at oxfordinspire.co.uk>
> Date: Sun, 30 Oct 2011 23:19:21 +0000
> Subject: [PATCH] Use xf86SetIntOption instead of xf86SetBoolOption for
>  integer configuration values in right mouse button
>  emulation code
> 
> Signed-off-by: Jools Wills <jools at oxfordinspire.co.uk>
> ---
>  src/emuThird.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/emuThird.c b/src/emuThird.c
> index a65c24e..d89fd9e 100644
> --- a/src/emuThird.c
> +++ b/src/emuThird.c
> @@ -279,11 +279,11 @@ Evdev3BEmuPreInit(InputInfoPtr pInfo)
>      emu3B->timeout = xf86SetIntOption(pInfo->options,
>                                        "EmulateThirdButtonTimeout",
>                                        1000);
> -    emu3B->button = xf86SetBoolOption(pInfo->options,
> +    emu3B->button = xf86SetIntOption(pInfo->options,
>                                        "EmulateThirdButtonButton",
>                                        3);
>      /* FIXME: this should be auto-configured based on axis ranges */
> -    emu3B->threshold = xf86SetBoolOption(pInfo->options,
> +    emu3B->threshold = xf86SetIntOption(pInfo->options,
>                                           "EmulateThirdButtonMoveThreshold",
>                                           DEFAULT_MOVE_THRESHOLD);
>      /* allocate now so we don't allocate in the signal handler */
> -- 
> 1.7.5.4
>