[clutter-gtk/wip/wayland: 4/5] wayland: Integrate GTK+ and Clutter's display

[Rob Bradford <rbradford src gnome org>]

commit 611490aadac8b4719d849b22155da73a26d034b5
Author: Rob Bradford <rob linux intel com>
Date:   Tue Sep 3 14:02:11 2013 +0100

    wayland: Integrate GTK+ and Clutter's display
    
    Tell Clutter to use the display from GTK and in order to avoid deadlocks
    on the Wayland socket disable Clutter's polling on that socket.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=695737

 clutter-gtk/gtk-clutter-util.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c
index 0752d7e..1c989a7 100644
--- a/clutter-gtk/gtk-clutter-util.c
+++ b/clutter-gtk/gtk-clutter-util.c
@@ -105,7 +105,8 @@ post_parse_hook (GOptionContext  *context,
       GDK_IS_WAYLAND_DISPLAY (display))
     {
       /* let GTK+ be in charge of the event handling */
-      /* FIXME: disable event retrieval */
+      clutter_wayland_disable_event_retrieval ();
+      clutter_wayland_set_display (gdk_wayland_display_get_wl_display (display));
     }
   else
 #endif