rpms/gnome-settings-daemon/F-10 gnome-settings-daemon-2.24.0-fix-touchpad.patch, 1.2, 1.3 gnome-settings-daemon.spec, 1.80, 1.81

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-settings-daemon/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29680

Modified Files:
	gnome-settings-daemon-2.24.0-fix-touchpad.patch 
	gnome-settings-daemon.spec 
Log Message:
* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 2.24.1-10
- Re-enable the touchpad left-handed fix, and checking for the
  right device type (extension pointer, not extension device)
  (#483639)

gnome-settings-daemon-2.24.0-fix-touchpad.patch:

Index: gnome-settings-daemon-2.24.0-fix-touchpad.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-10/gnome-settings-daemon-2.24.0-fix-touchpad.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gnome-settings-daemon-2.24.0-fix-touchpad.patch	10 Dec 2008 22:53:55 -0000	1.2
+++ gnome-settings-daemon-2.24.0-fix-touchpad.patch	29 Apr 2009 15:24:09 -0000	1.3
@@ -26,3 +26,16 @@ diff --git a/plugins/mouse/gsd-mouse-man
 +                return;
          }
  #endif
+
+diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
+--- gnome-settings-daemon-2.24.1/plugins/mouse/gsd-mouse-manager.c.catch-device-added	2009-04-29 14:35:00.000000000 +0100
++++ gnome-settings-daemon-2.24.1/plugins/mouse/gsd-mouse-manager.c	2009-04-29 15:50:29.000000000 +0100
+@@ -274,7 +274,7 @@ set_xinput_devices_left_handed (gboolean
+         for (i = 0; i < n_devices; i++) {
+                 XDevice *device = NULL;
+ 
+-                if ((device_info[i].use != IsXExtensionDevice) ||
++                if ((device_info[i].use != IsXExtensionPointer) ||
+                     (!xinput_device_has_buttons (&device_info[i])))
+                         continue;
+ 


Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-10/gnome-settings-daemon.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- gnome-settings-daemon.spec	18 Dec 2008 18:17:10 -0000	1.80
+++ gnome-settings-daemon.spec	29 Apr 2009 15:24:09 -0000	1.81
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.24.1
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -76,7 +76,7 @@ developing applications that use %{name}
 %patch11 -p1 -b .behdad
 %patch12 -p1 -b .umask
 %patch13 -p1 -b .shutdown-cleanly
-#%patch14 -p1 -b .fix-touchpad
+%patch14 -p1 -b .fix-touchpad
 %patch15 -p1 -b .catch-device-added
 
 %build
@@ -181,6 +181,11 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Apr 29 2009 Bastien Nocera <bnocera at redhat.com> 2.24.1-10
+- Re-enable the touchpad left-handed fix, and checking for the
+  right device type (extension pointer, not extension device)
+  (#483639)
+
 * Thu Dec 18 2008 Ray Strode <rstrode at redhat.com> - 2.24.1-9
 - Disable touchpad patch for now.  It's not right.