[clutter/wip/wayland: 7/45] test-wayland-surface: Use Clutter's own main loop



commit 9948d5287f3ef54af7ffa3d573a9b9cc8d1660ec
Author: Neil Roberts <neil linux intel com>
Date:   Mon Jan 9 12:54:50 2012 +0000

    test-wayland-surface: Use Clutter's own main loop
    
    I don't think there's any need to create our own GMainLoop so we might
    as well just call clutter_main() instead.

 tests/interactive/test-wayland-surface.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/tests/interactive/test-wayland-surface.c b/tests/interactive/test-wayland-surface.c
index 0040d11..05bc7f6 100644
--- a/tests/interactive/test-wayland-surface.c
+++ b/tests/interactive/test-wayland-surface.c
@@ -1055,7 +1055,6 @@ test_wayland_surface_main (int argc, char **argv)
   GIOChannel *signal_reciever;
   struct sigaction signal_action;
   TWSCompositor compositor;
-  GMainLoop *loop;
 
   memset (&compositor, 0, sizeof (compositor));
 
@@ -1086,7 +1085,6 @@ test_wayland_surface_main (int argc, char **argv)
   if (!compositor.wayland_shm)
     g_error ("Failed to allocate setup wayland shm callbacks");
 
-  loop = g_main_loop_new (NULL, FALSE);
   compositor.wayland_loop =
     wl_display_get_event_loop (compositor.wayland_display);
   compositor.wayland_event_source =
@@ -1137,8 +1135,7 @@ test_wayland_surface_main (int argc, char **argv)
   if (!start_xwayland (&compositor))
     return 1;
 
-
-  g_main_loop_run (loop);
+  clutter_main ();
 
   stop_xwayland (&compositor);
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]