gnome-base/gnome-settings-daemon: upstream proposed a different patch, let's use that instead

(Portage version: 2.2_rc16/cvs/Linux 2.6.27-gentoo-r2 x86_64)

2 files changed, 18 insertions, 16 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index c794cf2fb4d1..735f28b1ccbf 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.19 2008/12/02 15:02:18 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.20 2008/12/04 12:46:26 remi Exp $
+
+  04 Dec 2008; Rémi Cardona <remi@gentoo.org>
+  files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch:
+  upstream proposed a different patch, let's use that instead
 
 *gnome-settings-daemon-2.24.1-r1 (02 Dec 2008)
 
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch
index d86d9dd5d551..e118ecc7da4f 100644
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch
@@ -1,22 +1,20 @@
 Index: plugins/mouse/gsd-mouse-manager.c
 ===================================================================
---- plugins/mouse/gsd-mouse-manager.c	(révision 621)
-+++ plugins/mouse/gsd-mouse-manager.c	(copie de travail)
-@@ -328,6 +328,17 @@
+--- plugins/mouse/gsd-mouse-manager.c	(revision 621)
++++ plugins/mouse/gsd-mouse-manager.c	(working copy)
+@@ -329,9 +329,14 @@ devicepresence_filter (GdkXEvent *xevent
+ static void
  set_devicepresence_handler (GsdMouseManager *manager)
  {
-         Display *display = gdk_x11_get_default_xdisplay ();
-+ 
-+        XExtensionVersion *version = XGetExtensionVersion (display, INAME);
-+        if (!version || version == (XExtensionVersion*) NoSuchExtension)
-+            return;
-+
-+        if (!version->present)
-+        {
-+            XFree (version);
-+            return;
-+        }
-+
+-        Display *display = gdk_x11_get_default_xdisplay ();
++        Display *display;
          XEventClass class_presence;
          int xi_presence;
++
++        if (!supports_xinput_devices ())
++                return;
++
++        display = gdk_x11_get_default_xdisplay ();
  
+         gdk_error_trap_push ();
+         DevicePresence (display, xi_presence, class_presence);