From e4faa2ab051aca454f3952f458dac42491e54954 Mon Sep 17 00:00:00 2001 From: Tiago Vignatti Date: Mon, 16 Apr 2012 17:31:44 +0300 Subject: [PATCH] compositor: init shell after xserver This reverts a snip from commit d012e9df. On that commit, it was lost the ability of calling X applications from desktop panel; xserver module was setting DISPLAY only later, after panel was already launched. Signed-off-by: Tiago Vignatti --- src/compositor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compositor.c b/src/compositor.c index 3e0139d8..03f0eb19 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -2601,9 +2601,6 @@ int main(int argc, char *argv[]) ec->option_idle_time = idle_time; ec->idle_time = idle_time; - if (shell_init(ec) < 0) - exit(EXIT_FAILURE); - xserver_init = NULL; if (xserver) xserver_init = load_module("xserver-launcher.so", @@ -2612,6 +2609,9 @@ int main(int argc, char *argv[]) if (xserver_init) xserver_init(ec); + if (shell_init(ec) < 0) + exit(EXIT_FAILURE); + if (wl_display_add_socket(display, socket_name)) { fprintf(stderr, "failed to add socket: %m\n"); exit(EXIT_FAILURE);