On Sun, Sep 19, 2010 at 09:49:58AM +0200, Giuseppe Bilotta wrote: > This must be done before SetDeviceAndProtocol to ensure that the > "Device" option is set correctly. > > Signed-off-by: Giuseppe Bilotta <[email protected]> > --- > src/synaptics.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/src/synaptics.c b/src/synaptics.c > index eae48d2..89398f5 100644 > --- a/src/synaptics.c > +++ b/src/synaptics.c > @@ -705,6 +705,8 @@ SynapticsPreInit(InputDriverPtr drv, InputInfoPtr pInfo, > int flags) > pInfo->conversion_proc = ConvertProc; > pInfo->private = priv; > > + xf86CollectInputOptions(pInfo, NULL, NULL); > + > xf86OptionListReport(pInfo->options); > > /* allocate now so we don't allocate in the signal handler */ > -- > 1.7.3.rc1.230.gdf48043
with the new input API, the server calls xf86CollectInputOptions() already, so this only needs to go into the old PreInit function. ACK to the second patch though, please send me a new version of this and I'll push it. thanks. Cheers, Peter _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
