summarylogtreecommitdiffstats
path: root/xinput.patch
diff options
context:
space:
mode:
Diffstat (limited to 'xinput.patch')
-rw-r--r--xinput.patch36
1 files changed, 36 insertions, 0 deletions
diff --git a/xinput.patch b/xinput.patch
new file mode 100644
index 000000000000..67c8082cbb72
--- /dev/null
+++ b/xinput.patch
@@ -0,0 +1,36 @@
+From 14f92b1479aa065edf3f0aa86b87d4c4ff1fe2ba Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Thu, 07 Feb 2013 04:14:22 +0000
+Subject: Fix media-keys handling with GTK+ 3.7.8
+
+GDK now requests XI 2.3 and if the X server supports that
+version, subsequent requests for a lower version yield
+a BadValue. Therefore, we need to change the code in
+gsd-input-helper.c to request 2.3 as well.
+---
+diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
+index 54427af..d5d2a2a 100644
+--- a/plugins/common/gsd-input-helper.c
++++ b/plugins/common/gsd-input-helper.c
+@@ -144,18 +144,11 @@ supports_xinput2_devices (int *opcode)
+ gdk_error_trap_push ();
+
+ major = 2;
+- minor = 0;
++ minor = 3;
+
+ if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
+ gdk_error_trap_pop_ignored ();
+- /* try for 2.2, maybe gtk has already announced 2.2 support */
+- gdk_error_trap_push ();
+- major = 2;
+- minor = 2;
+- if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
+- gdk_error_trap_pop_ignored ();
+ return FALSE;
+- }
+ }
+ gdk_error_trap_pop_ignored ();
+
+--
+cgit v0.9.1