rpms/xorg-x11-drv-synaptics/devel synaptics-1.2.0-timer-fix.patch, NONE, 1.1 xorg-x11-drv-synaptics.spec, 1.37, 1.38

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3351

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	synaptics-1.2.0-timer-fix.patch 
Log Message:
* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.2.0-3
- synaptics-1.2.0-timer-fix.patch: Don't free the timer in DeviceClose, since
  that gets called on VT switch. (#540248)


synaptics-1.2.0-timer-fix.patch:
 synaptics.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE synaptics-1.2.0-timer-fix.patch ---
diff -up xf86-input-synaptics-1.2.0/src/synaptics.c.jx xf86-input-synaptics-1.2.0/src/synaptics.c
--- xf86-input-synaptics-1.2.0/src/synaptics.c.jx	2009-12-09 12:41:30.000000000 -0500
+++ xf86-input-synaptics-1.2.0/src/synaptics.c	2009-12-09 12:42:08.000000000 -0500
@@ -791,8 +791,7 @@ DeviceOff(DeviceIntPtr dev)
     DBG(3, ErrorF("Synaptics DeviceOff called\n"));
 
     if (local->fd != -1) {
-	TimerFree(priv->timer);
-	priv->timer = NULL;
+	TimerCancel(priv->timer);
 	xf86RemoveEnabledDevice(local);
         if (priv->proto_ops->DeviceOffHook)
             priv->proto_ops->DeviceOffHook(local);


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- xorg-x11-drv-synaptics.spec	20 Nov 2009 00:09:36 -0000	1.37
+++ xorg-x11-drv-synaptics.spec	9 Dec 2009 17:43:10 -0000	1.38
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -18,6 +18,8 @@ Source0:        ftp://ftp.x.org/pub/indi
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
+Patch0:		synaptics-1.2.0-timer-fix.patch
+
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -74,6 +76,7 @@ Features:
 %prep
 %setup -q -n %{tarball}-%{version}
 #%setup -q -n %{tarball}-%{gitdate}
+%patch0 -p1 -b .timer-fix
 
 %build
 autoreconf -v --install --force || exit 1
@@ -122,6 +125,10 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.2.0-3
+- synaptics-1.2.0-timer-fix.patch: Don't free the timer in DeviceClose, since
+  that gets called on VT switch. (#540248)
+
 * Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.0-2
 - BuildRequires xorg-x11-util-macros 1.3.0