From 9d355f12c6d1c804a3e0d205e2ff1c8e3f5e7538 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 27 Jan 2012 11:42:33 +0000 Subject: [PATCH] conform: Avoid a deadlock Something is causing a deadlock when using clutter_threads_* API inside the offscreen redirect conformance test. The conformance tests are pretty insane anyway, so for the time being, let's put g_timeout_add() back in while we figure out the issue. --- tests/conform/test-offscreen-redirect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/conform/test-offscreen-redirect.c b/tests/conform/test-offscreen-redirect.c index 23759f805..44d726773 100644 --- a/tests/conform/test-offscreen-redirect.c +++ b/tests/conform/test-offscreen-redirect.c @@ -333,7 +333,7 @@ test_offscreen_redirect (TestConformSimpleFixture *fixture, /* Start the test after a short delay to allow the stage to render its initial frames without affecting the results */ - clutter_threads_add_timeout_full (G_PRIORITY_LOW, 250, timeout_cb, &data, NULL); + g_timeout_add_full (G_PRIORITY_LOW, 250, timeout_cb, &data, NULL); clutter_main ();