From 745ca8a62ca52eedfad850e556f160f36eb32953 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 5 Jun 2009 12:06:09 +0100 Subject: [PATCH] [xinput] Invert the XI extension version check Since having XQueryInputVersion means also having XGetExtensionVersion we need to check the former first to avoid the deprecation warning. --- clutter/x11/clutter-backend-x11.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c index ab3760f..55e2d06 100644 --- a/clutter/x11/clutter-backend-x11.c +++ b/clutter/x11/clutter-backend-x11.c @@ -677,10 +677,10 @@ _clutter_x11_register_xinput () backend_singleton->have_xinput = TRUE; -#ifdef HAVE_XGET_EXTENSION_VERSION - ext = XGetExtensionVersion (backend_singleton->xdpy, INAME); -#elif HAVE_XQUERY_INPUT_VERSION +#if defined(HAVE_XQUERY_INPUT_VERSION) ext = XQueryInputVersion (backend_singleton->xdpy, XI_2_Major, XI_2_Minor); +#elif defined(HAVE_XGET_EXTENSION_VERSION) + ext = XGetExtensionVersion (backend_singleton->xdpy, INAME); #else g_critical ("XInput does not have XGetExtensionVersion nor " "XQueryInputVersion"); -- 2.7.4