xserver-xorg-input-synaptics: Changes to 'upstream-unstable'

[Cyril Brulebois <kibi@alioth.debian.org>]

 configure.ac  |    2 +-
 src/psmcomm.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit de0dfb76444ad4160468d00515876c91a9fa20bf
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date:   Fri Mar 4 12:36:24 2011 +1000

    synaptics 1.4.0
    
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/configure.ac b/configure.ac
index ea66935..c057ffb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
 # Initialize Autoconf
 AC_PREREQ([2.60])
 AC_INIT([xf86-input-synaptics],
-        [1.3.99.901],
+        [1.4.0],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         [xf86-input-synaptics])
 AC_CONFIG_SRCDIR([Makefile.am])

commit fefb3b63c589b0758c02777e652f05e537ba663f
Author: Julien Cristau <jcristau@debian.org>
Date:   Fri Feb 25 20:41:12 2011 +0100

    Fix build on BSD
    
    local was renamed to pInfo in 81ad2e389d11691d5c2687d83150e8e9033cfe76,
    but a couple places were missed.
    
    Signed-off-by: Julien Cristau <jcristau@debian.org>
    Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/src/psmcomm.c b/src/psmcomm.c
index 66e8d1e..741cd1d 100644
--- a/src/psmcomm.c
+++ b/src/psmcomm.c
@@ -147,7 +147,7 @@ PSMQueryHardware(InputInfoPtr pInfo)
     synhw = (struct SynapticsHwInfo*)priv->proto_data;
 
     /* is the synaptics touchpad active? */
-    if (!PSMQueryIsSynaptics(local))
+    if (!PSMQueryIsSynaptics(pInfo))
 	return FALSE;
 
     xf86Msg(X_PROBED, "%s synaptics touchpad found\n", pInfo->name);
@@ -167,7 +167,7 @@ PSMReadHwState(InputInfoPtr pInfo,
 	       struct SynapticsProtocolOperations *proto_ops,
 	       struct CommData *comm, struct SynapticsHwState *hwRet)
 {
-    return psaux_proto_operations.ReadHwState(local, proto_ops, comm, hwRet);
+    return psaux_proto_operations.ReadHwState(pInfo, proto_ops, comm, hwRet);
 }
 
 static Bool PSMAutoDevProbe(InputInfoPtr pInfo)