| 1 |
From: Sjoerd Simons <[email protected]> |
| 2 |
Date: Thu, 25 Jun 2015 10:39:48 +0200 |
| 3 |
Subject: [PATCH] Rely on gdk to dispatch wayland events |
| 4 |
|
| 5 |
Disable cogl dispatching wayland events as Gdk will already be |
| 6 |
dispatching them causing a deadlock when cogl tries again to dispatch |
| 7 |
wayland events. |
| 8 |
|
| 9 |
https://bugzilla.gnome.org/show_bug.cgi?id=774079 |
| 10 |
--- |
| 11 |
clutter/gdk/clutter-backend-gdk.c | 2 +- |
| 12 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 13 |
|
| 14 |
diff --git a/clutter/gdk/clutter-backend-gdk.c b/clutter/gdk/clutter-backend-gdk.c |
| 15 |
index 25c687b..f81b85b 100644 |
| 16 |
--- a/clutter/gdk/clutter-backend-gdk.c |
| 17 |
+++ b/clutter/gdk/clutter-backend-gdk.c |
| 18 |
@@ -275,7 +275,7 @@ clutter_backend_gdk_get_renderer (ClutterBackend *backend, |
| 19 |
/* Force a Wayland winsys */ |
| 20 |
cogl_renderer_set_winsys_id (renderer, COGL_WINSYS_ID_EGL_WAYLAND); |
| 21 |
cogl_wayland_renderer_set_foreign_display (renderer, display); |
| 22 |
- cogl_wayland_renderer_set_event_dispatch_enabled (renderer, !disable_event_retrieval); |
| 23 |
+ cogl_wayland_renderer_set_event_dispatch_enabled (renderer, FALSE); |
| 24 |
} |
| 25 |
else |
| 26 |
#endif |