[gnome-settings-daemon/gnome-3-2] common: hardcode the supported XI2 version number
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon/gnome-3-2] common: hardcode the supported XI2 version number
- Date: Tue, 8 Nov 2011 13:49:13 +0000 (UTC)
commit f81c019a7e9916e59d760f3324f1613c5db3b525
Author: Peter Hutterer <peter hutterer who-t net>
Date: Fri Nov 4 08:46:31 2011 +1000
common: hardcode the supported XI2 version number
XI2_Major/XI2_Minor are the _current_ version of the protocol as exported by
the inputproto header files. If gsd is compiled against new headers and runs
against a 2.0 server it reports "no XInput2 supported" otherwise.
plugins/common/gsd-input-helper.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c
index 2b71123..ed7d3c6 100644
--- a/plugins/common/gsd-input-helper.c
+++ b/plugins/common/gsd-input-helper.c
@@ -108,8 +108,8 @@ supports_xinput2_devices (void)
gdk_error_trap_push ();
- major = XI_2_Major;
- minor = XI_2_Minor;
+ major = 2;
+ minor = 0;
if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) {
gdk_error_trap_pop_ignored ();
@@ -117,7 +117,7 @@ supports_xinput2_devices (void)
}
gdk_error_trap_pop_ignored ();
- if ((major * 1000 + minor) < (XI_2_Major * 1000 + XI_2_Minor))
+ if ((major * 1000 + minor) < (2000))
return FALSE;
return TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]