From 3f3d1ffee48b5a41910378dcd7c869397ca882d4 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 17 Aug 2015 18:20:56 -0400 Subject: [PATCH] Rearrange main.c some more --- sway/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sway/main.c b/sway/main.c index aa8546e9d..2db4604cc 100644 --- a/sway/main.c +++ b/sway/main.c @@ -12,17 +12,17 @@ static void sigchld_handle(int signal); int main(int argc, char **argv) { - init_log(L_DEBUG); // TODO: Control this with command line arg - init_layout(); - /* Signal handling */ signal(SIGCHLD, sigchld_handle); setenv("WLC_DIM", "0", 0); + /* Changing code earlier than this point requires detailed review */ if (!wlc_init(&interface, argc, argv)) { return 1; } - setenv("DISPLAY", ":1", 1); + + init_log(L_DEBUG); // TODO: Control this with command line arg + init_layout(); if (!load_config()) { sway_log(L_ERROR, "Error(s) loading config!");