From 3717e639ee59b57e513bb49b7d99f07eb0875941 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Thu, 17 Aug 2017 16:39:48 +0300 Subject: [PATCH] weston: move weston_output_enable() into callers Move the call out of wet_configure_windowed_output_from_config() and into its callers. This allows to migrate each frontend one by one. Signed-off-by: Pekka Paalanen Reviewed-by: Ian Ray Reviewed-by: Daniel Stone Acked-by: Derek Foreman --- compositor/main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compositor/main.c b/compositor/main.c index 1e827884..72b1d332 100644 --- a/compositor/main.c +++ b/compositor/main.c @@ -1007,8 +1007,6 @@ wet_configure_windowed_output_from_config(struct weston_output *output, return -1; } - weston_output_enable(output); - return 0; } @@ -1152,6 +1150,8 @@ headless_backend_output_configure(struct wl_listener *listener, void *data) if (wet_configure_windowed_output_from_config(output, &defaults) < 0) weston_log("Cannot configure output \"%s\".\n", output->name); + + weston_output_enable(output); } static int @@ -1370,6 +1370,8 @@ x11_backend_output_configure(struct wl_listener *listener, void *data) if (wet_configure_windowed_output_from_config(output, &defaults) < 0) weston_log("Cannot configure output \"%s\".\n", output->name); + + weston_output_enable(output); } static int @@ -1486,6 +1488,8 @@ wayland_backend_output_configure(struct wl_listener *listener, void *data) if (wet_configure_windowed_output_from_config(output, &defaults) < 0) weston_log("Cannot configure output \"%s\".\n", output->name); + + weston_output_enable(output); } static int