rpms/gnome-settings-daemon/F-11 buttonmapping.patch, NONE, 1.1 gnome-settings-daemon.spec, 1.108, 1.109

[Peter Hutterer]

Author: whot

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

Modified Files:
	gnome-settings-daemon.spec 
Added Files:
	buttonmapping.patch 
Log Message:
* Wed Aug 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.26.1-9
- buttonmapping.patch: Don't check for IsXExtensionDevice, only skip button
  mappings for core devices instead (#502129).


buttonmapping.patch:
 gsd-mouse-manager.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE buttonmapping.patch ---
>From 77e4a88e1a4abd72f036eb6fda208cb36faff162 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at 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



Index: gnome-settings-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-settings-daemon/F-11/gnome-settings-daemon.spec,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- gnome-settings-daemon.spec	17 Jul 2009 05:10:10 -0000	1.108
+++ gnome-settings-daemon.spec	26 Aug 2009 04:00:05 -0000	1.109
@@ -1,6 +1,6 @@
 Name:		gnome-settings-daemon
 Version:	2.26.1
-Release:	8%{?dist}
+Release:	9%{?dist}
 Summary:	The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:		System Environment/Daemons
@@ -51,6 +51,7 @@ Patch15:        composited-changed.patch
 
 Patch16:	there-can-be-only-one.patch
 Patch17:	syndaemon-k.patch
+Patch18:	buttonmapping.patch
 
 %description
 A daemon to share settings from GNOME to other applications. It also
@@ -78,6 +79,7 @@ developing applications that use %{name}
 %patch15 -p1 -b .composited-changed
 %patch16 -p1 -b .multi-syndaemon
 %patch17 -p1 -b .syndaemon-k
+%patch18 -p1 -b .buttonmapping
 
 autoreconf -i -f
 
@@ -190,6 +192,10 @@ fi
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Wed Aug 26 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.26.1-9
+- buttonmapping.patch: Don't check for IsXExtensionDevice, only skip button
+  mappings for core devices instead (#502129).
+
 * Fri Jul 17 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.26.1-8
 - Spawn syndaemon with "-k" flag to ignore modifier keys.