[clutter/clutter-1.10] conform: Put xinput enabling under guards
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/clutter-1.10] conform: Put xinput enabling under guards
- Date: Wed, 20 Jun 2012 07:54:22 +0000 (UTC)
commit a9847496a840f858b50259e56773667636c378c9
Author: Emmanuele Bassi <ebassi gnome org>
Date: Wed Jun 20 08:50:48 2012 +0100
conform: Put xinput enabling under guards
Calling clutter_x11_* API should be done only under the platform
specific guards we provide with Clutter.
https://bugzilla.gnome.org/show_bug.cgi?id=678423
tests/conform/test-conform-common.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/tests/conform/test-conform-common.c b/tests/conform/test-conform-common.c
index 2a80166..09474bc 100644
--- a/tests/conform/test-conform-common.c
+++ b/tests/conform/test-conform-common.c
@@ -31,7 +31,7 @@ test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture,
"$ make test-report");
counter++;
-#ifdef HAVE_CLUTTER_GLX
+#ifdef CLUTTER_WINDOWING_X11
{
/* on X11 we need a display connection to run the test suite */
const gchar *display = g_getenv ("DISPLAY");
@@ -43,9 +43,10 @@ test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture,
exit (EXIT_SUCCESS);
}
}
-#endif
+ /* enable XInput support */
clutter_x11_enable_xinput ();
+#endif
g_assert (clutter_init (shared_state->argc_addr, shared_state->argv_addr)
== CLUTTER_INIT_SUCCESS);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]