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

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.27-gentoo-r2 x86_64

3 files changed, 20 insertions, 18 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/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index 37f33e91adb1..cdc466fb4a15 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,5 +1,5 @@
 AUX gnome-settings-daemon-2.24.0-automagic.patch 1656 RMD160 895fe60a74854d14229fa81fb534dc2379b3de8c SHA1 dfbfdc227104cc4339e8ff4c5bc8d3208a18f09c SHA256 ebf248ccbe911200ff256df37345f07c2291caf165b16331e6916ccf24be003d
-AUX gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch 709 RMD160 39d2c64c6e81d2aeb02dbbdfa81f8d8a38086ff7 SHA1 101d117e8c3072e9ad588435e801dd4d134695af SHA256 9d3ae8148fe52eebb28ae243bc95942de2b8d27a50097c7edae175c55926b739
+AUX gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch 721 RMD160 0a852a0d0027d05b6086e69cc41468edf5d82192 SHA1 07f8e843740d145cc2fc0dd328435586567fbcb9 SHA256 03d5f3e46baff9f4472410e0d2a58477908af23de2148cb3cd9b202121b60663
 DIST gnome-settings-daemon-2.22.2.1.tar.bz2 1139262 RMD160 c79d531226f8e58e0acd8f23177a62c8818b70d7 SHA1 0424486b6e53ab0d2dd676c375d02e35341b3a20 SHA256 72cb9aee096019a2925fb5b99a5e880d01f7d529d4c9e75dfbbea1b1f654d7a9
 DIST gnome-settings-daemon-2.24.0.tar.bz2 1119609 RMD160 da517b2a5841ba4044c7ee69f784894f622ec5f3 SHA1 7d95a7550c465c9a64e4bda64331c92069958bfd SHA256 98377ed6d7c4abb75b746570f07e00a4346ba6f5924574130211beca764bb99d
 DIST gnome-settings-daemon-2.24.1.tar.bz2 1131518 RMD160 27d432cd217a836fcef0deac5f80f638a73cda7c SHA1 d0dbf6ba82cdc1e814d6c46bdc363e61ee9fd0f3 SHA256 a2a5132a5b9d0bef52010ea45b14560b6344f591ce3296ed555165332cce9a70
@@ -7,5 +7,5 @@ EBUILD gnome-settings-daemon-2.22.2.1.ebuild 1402 RMD160 892cee9f8acfcef02afd0ac
 EBUILD gnome-settings-daemon-2.24.0.ebuild 2239 RMD160 ac1169181ee8e382a2079d2572fb935c8599e99e SHA1 e8ef308613e754ab4be4823b8cd812d39a83953e SHA256 24340eb32674b0d01e7d2d9cbb992cc63a0e9c43cf9f99416ef82a8199b3094b
 EBUILD gnome-settings-daemon-2.24.1-r1.ebuild 2373 RMD160 d3a93a37f3efd765279c41cc288f1282d1c265e3 SHA1 c7575828c3537366a49289f5cf18c845c36c7779 SHA256 eb0b8dbceb2749ac9eeebe8c20082d0a6efac6960f70594039528b98d0665559
 EBUILD gnome-settings-daemon-2.24.1.ebuild 2242 RMD160 a60e874d778dade248db370170a920903accc118 SHA1 774360ce6f94cac77e3961355734a3bfc79f3eaa SHA256 31d5acd6a38f9e6e933c5f19961cccce47056b0bb8b476dae4d47b71ab67519d
-MISC ChangeLog 3884 RMD160 671c62e5c7633f5aebf5a0def537279b78e3d763 SHA1 7a3403cf03bfb20eb6f7d086df63a29353813eac SHA256 14eb3cd82ff1e8ee840de099ae4a2d8542c72a07300c6b1b8670567949d0e0b0
+MISC ChangeLog 4067 RMD160 15d5488d05c4725381aed02972b58bd2c9a10b59 SHA1 0bffffb8ff6bacbaf64e733ff04afc39820b7cdb SHA256 1cf6581b771a5f37f3212f87d564d4d4542ae848207152328d47cba376bef877
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
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);