diff options
author | Drew DeVault <sir@cmpwn.com> | 2017-02-23 08:32:11 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2017-02-23 08:32:11 -0500 |
commit | 407ebe9cd3eb34979b4c7b14c9c4a2dbfe2a5103 (patch) | |
tree | 8c341beedb3f20624886a4ea782689f73fd86a2e | |
parent | Merge pull request #1081 from 4e554c4c/swaylock_colors (diff) | |
download | sway-407ebe9cd3eb34979b4c7b14c9c4a2dbfe2a5103.tar.gz sway-407ebe9cd3eb34979b4c7b14c9c4a2dbfe2a5103.tar.zst sway-407ebe9cd3eb34979b4c7b14c9c4a2dbfe2a5103.zip |
Move env logging to earlier than wlc_init
-rw-r--r-- | sway/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sway/main.c b/sway/main.c index 0151e078..5e3b2415 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -310,6 +310,9 @@ int main(int argc, char **argv) { | |||
310 | init_log(L_ERROR); | 310 | init_log(L_ERROR); |
311 | } | 311 | } |
312 | wlc_log_set_handler(wlc_log_handler); | 312 | wlc_log_set_handler(wlc_log_handler); |
313 | log_kernel(); | ||
314 | log_distro(); | ||
315 | log_env(); | ||
313 | detect_proprietary(); | 316 | detect_proprietary(); |
314 | 317 | ||
315 | input_devices = create_list(); | 318 | input_devices = create_list(); |
@@ -346,9 +349,6 @@ int main(int argc, char **argv) { | |||
346 | #if defined SWAY_GIT_VERSION && defined SWAY_GIT_BRANCH && defined SWAY_VERSION_DATE | 349 | #if defined SWAY_GIT_VERSION && defined SWAY_GIT_BRANCH && defined SWAY_VERSION_DATE |
347 | sway_log(L_INFO, "Starting sway version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH); | 350 | sway_log(L_INFO, "Starting sway version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH); |
348 | #endif | 351 | #endif |
349 | log_kernel(); | ||
350 | log_distro(); | ||
351 | log_env(); | ||
352 | 352 | ||
353 | init_layout(); | 353 | init_layout(); |
354 | 354 | ||