brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conform: Put xinput enabling under guards

Browse Source 
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
This commit is contained in:
Emmanuele Bassi 2012-06-20 08:50:48 +01:00
parent 5eb3fbf3cf
commit 47f8be4d4b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/conform/test-conform-common.c
View File

@ -31,7 +31,7 @@ test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture,
"$ make test-report"); "$ make test-report");
counter++; counter++;
#ifdef HAVE_CLUTTER_GLX #ifdef CLUTTER_WINDOWING_X11
{ {
/* on X11 we need a display connection to run the test suite */ /* on X11 we need a display connection to run the test suite */
const gchar *display = g_getenv ("DISPLAY"); const gchar *display = g_getenv ("DISPLAY");
@ -43,9 +43,10 @@ test_conform_simple_fixture_setup (TestConformSimpleFixture *fixture,
exit (EXIT_SUCCESS); exit (EXIT_SUCCESS);
} }
} }
#endif
/* enable XInput support */
clutter_x11_enable_xinput (); clutter_x11_enable_xinput ();
#endif
g_assert (clutter_init (shared_state->argc_addr, shared_state->argv_addr) g_assert (clutter_init (shared_state->argc_addr, shared_state->argv_addr)
== CLUTTER_INIT_SUCCESS); == CLUTTER_INIT_SUCCESS);