diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-10-25 14:36:59 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-11-18 11:35:42 +1000 |
| commit | 7bf22a368c752fe76dc60c3ea0f70ec1a46d653e (patch) | |
| tree | f18a17bf202a6dd3b03ed544b223e9b7fe556f0b /src/mouse.c | |
| parent | f3f405db5603ecca5bc14dba23628ea56a0f5202 (diff) | |
| download | xorg-driver-xf86-input-mouse-7bf22a368c752fe76dc60c3ea0f70ec1a46d653e.tar.gz | |
Use pInfo->options instead of conf-idev.
Because it doesn't really matter anyway, I think.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Diffstat (limited to 'src/mouse.c')
| -rw-r--r-- | src/mouse.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mouse.c b/src/mouse.c index fb9ccc8..e600474 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -923,7 +923,11 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags) pMse->autoProbe = FALSE; /* Collect the options, and process the common options. */ - xf86CollectInputOptions(pInfo, pProto->defaults, NULL); + /* need some special handling here. xf86CollectInputOptions will reset + * pInfo->options if the second argument is not-null. To re-merge the + * previously set arguments, pass the original pInfo->options in. + */ + xf86CollectInputOptions(pInfo, pProto->defaults, pInfo->options); xf86ProcessCommonOptions(pInfo, pInfo->options); /* Check if the device can be opened. */ |