aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2015-08-17 18:20:56 -0400
committerDrew DeVault <sir@cmpwn.com>2015-08-17 18:20:56 -0400
commit3f3d1ffee48b5a41910378dcd7c869397ca882d4 (patch)
treec9771bd7f5b3aaa37427fdf520aaf03de7916c8c
parent7427ce89303a2f409ed651643bd8c6566217e7c5 (diff)
Rearrange main.c some more
-rw-r--r--sway/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/main.c b/sway/main.c
index aa8546e9..2db4604c 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!");