From b11c75c1c99d5e3aff139218a2cb53a40e9c2eb0 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Tue, 11 Mar 2014 16:48:52 -0400 Subject: [PATCH] weston-launch: Rearrange code slightly We need to initialize the main loops before our callback is called, so this makes it make a slight bit of more sense. --- src/wayland/meta-weston-launch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wayland/meta-weston-launch.c b/src/wayland/meta-weston-launch.c index f24221d1c..f299477e9 100644 --- a/src/wayland/meta-weston-launch.c +++ b/src/wayland/meta-weston-launch.c @@ -354,8 +354,6 @@ meta_launcher_new (void) self->weston_launch = g_socket_new_from_fd (launch_fd, NULL); - clutter_evdev_set_open_callback (on_evdev_device_open, self); - self->nested_context = g_main_context_new (); self->nested_loop = g_main_loop_new (self->nested_context, FALSE); @@ -369,6 +367,8 @@ meta_launcher_new (void) g_source_attach (self->inner_source, self->nested_context); g_source_unref (self->inner_source); + clutter_evdev_set_open_callback (on_evdev_device_open, self); + return self; }