From 8e4b3c60a0c4f0f59d0bea99480bd1b8180f374c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Aug 26 2009 04:33:47 +0000
Subject: - buttonmapping.patch: Don't check for IsXExtensionDevice, only skip button

    mappings for core devices instead (#502129).

---

diff --git a/buttonmapping.patch b/buttonmapping.patch
new file mode 100644
index 0000000..03ac8f7
--- /dev/null
+++ b/buttonmapping.patch
@@ -0,0 +1,34 @@
+From 77e4a88e1a4abd72f036eb6fda208cb36faff162 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 26 Aug 2009 09:48:06 +1000
+Subject: [PATCH] Skip button mappings only for core devices.
+
+Since server 1.4, devices are unlikely to be marked as IsXExtensionPointer.
+More common is IsXExtensionKeyboard or IsXExtensionPointer.
+However, with many pointer devices also having keys (e.g. most wireless
+combos) a check for IsXExtensionPointer is unreliable.
+
+In gsd-mouse-manager, skip the XInput button mapping only if the device is a
+core device. Otherwise, test for buttons.
+
+---
+ plugins/mouse/gsd-mouse-manager.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
+index 30e649d..7fae963 100644
+--- a/plugins/mouse/gsd-mouse-manager.c
++++ b/plugins/mouse/gsd-mouse-manager.c
+@@ -283,7 +283,8 @@ set_xinput_devices_left_handed (gboolean left_handed)
+         for (i = 0; i < n_devices; i++) {
+                 XDevice *device = NULL;
+ 
+-                if ((device_info[i].use != IsXExtensionPointer) ||
++                if ((device_info[i].use == IsXPointer) ||
++                    (device_info[i].use == IsXKeyboard) ||
+                     (!xinput_device_has_buttons (&device_info[i])))
+                         continue;
+ 
+-- 
+1.6.3.rc1.2.g0164.dirty
+
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 75877b3..ee0e729 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.27.91
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -36,6 +36,8 @@ BuildRequires:  fontconfig-devel
 Patch12:	gnome-settings-daemon-2.26.1-fix-touchpad.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=524499
 Patch13:	locate-pointer-process.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593112
+Patch14:	buttonmapping.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -57,6 +59,7 @@ developing applications that use %{name}.
 
 %patch12 -p1 -b .lefthand-touchpad
 %patch13 -p1 -b .locate-pointer
+%patch14 -p1 -b .buttonmap
 
 autoreconf -i -f
 
@@ -170,6 +173,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Aug 26 2009 Peter Hutterer <peter.hutterer@redhat.com> 2.27.91-2
+- buttonmapping.patch: Don't check for IsXExtensionDevice, only skip button
+  mappings for core devices instead (#502129).
+
 * Mon Aug 24 2009 Bastien Nocera <bnocera@redhat.com> 2.27.91-1
 - Update to 2.27.91