From ff90ce659c8030a8257430738081f0057f122dbc Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@fedoraproject.org>
Date: Dec 10 2008 16:35:20 +0000
Subject: - actually apply the patch previoulsy mentioned for bug 474758

- Don't map touch pad tap to right-click for left-handed users (bug 324721)

---

diff --git a/gnome-settings-daemon-2.24.0-fix-touchpad.patch b/gnome-settings-daemon-2.24.0-fix-touchpad.patch
new file mode 100644
index 0000000..2426ae2
--- /dev/null
+++ b/gnome-settings-daemon-2.24.0-fix-touchpad.patch
@@ -0,0 +1,21 @@
+===========================================================
+ Ignore touchpads when swapping buttons
+
+  We always want clicks on the touchpad
+to be left click (bug 324721)
+
+diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
+--- a/plugins/mouse/gsd-mouse-manager.c
++++ b/plugins/mouse/gsd-mouse-manager.c
+@@ -233,6 +233,11 @@ xinput_device_has_buttons (XDeviceInfo *device_info)
+         int i;
+         XAnyClassInfo *class_info;
+ 
++        if (device_info->type == gdk_x11_get_xatom_by_name (XI_TABLET) ||
++            device_info->type == gdk_x11_get_xatom_by_name (XI_TOUCHSCREEN) ||
++            device_info->type == gdk_x11_get_xatom_by_name (XI_TOUCHPAD))
++                return FALSE;
++
+         class_info = device_info->inputclassinfo;
+         for (i = 0; i < device_info->num_classes; i++) {
+                 if (class_info->class == ButtonClass) {
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 502aeff..b7e63f5 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.24.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -42,7 +42,15 @@ Patch11:        gsd-patches-behdad-f10.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=563543
 Patch12:	gnome-settings-daemon-2.24.1-umask.patch
-Patch13:        gnome-settings-daemon-2.24.0-shutdown-cleanly.patch
+
+# http://bugzilla.redhat.com/445898
+Patch13:	gnome-settings-daemon-2.24.0-shutdown-cleanly.patch
+
+# http://bugzilla.redhat.com/324721
+Patch14:	gnome-settings-daemon-2.24.0-fix-touchpad.patch
+
+# http://bugzilla.redhat.com/474758
+Patch15:	gnome-settings-daemon-2.24.0-catch-deviceadded.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -68,6 +76,8 @@ developing applications that use %{name}.
 %patch11 -p1 -b .behdad
 %patch12 -p1 -b .umask
 %patch13 -p1 -b .shutdown-cleanly
+%patch14 -p1 -b .fix-touchpad
+%patch15 -p1 -b .catch-device-added
 
 %build
 libtoolize --force --copy
@@ -171,6 +181,11 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Dec 10 2008 Ray Strode <rstrode@redhat.com> - 2.24.1-6
+- actually apply the patch previoulsy mentioned for bug 474758
+- Don't map touch pad tap to right-click for left-handed
+  users (bug 324721)
+
 * Wed Dec 10 2008 Ray Strode <rstrode@redhat.com> - 2.24.1-5
 - Listen for DeviceAdded signals when configuring mouse
   (in addition to DeviceEnabled).  This may help with