summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Cardona <remi@gentoo.org>2008-12-04 12:46:27 +0000
committerRémi Cardona <remi@gentoo.org>2008-12-04 12:46:27 +0000
commitb09f922ffcec966ad37225b999f29070f23c5e07 (patch)
treee7e0d5f6a817640dc3133e0103cb8a4d0e304c12 /gnome-base/gnome-settings-daemon/files
parentFixed bug in checking of what netbeans modules need to be added (diff)
downloadgentoo-2-b09f922ffcec966ad37225b999f29070f23c5e07.tar.gz
gentoo-2-b09f922ffcec966ad37225b999f29070f23c5e07.tar.bz2
gentoo-2-b09f922ffcec966ad37225b999f29070f23c5e07.zip
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)
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files')
-rw-r--r--gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-2.24.1-check-for-server-side-XInput.patch28
1 files changed, 13 insertions, 15 deletions
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);