From eb680c8f887b8a08e8f830d0fa15657d9b1c3f17 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Sun, 22 Sep 2024 15:48:38 -0500 Subject: [PATCH] Print `SWAYSOCK` after it is set for this Sway instance `log_env` attempts to query SWAYSOCK env variable before ipc server is initialized. Also cleans up unused files from main.c --- sway/main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sway/main.c b/sway/main.c index 1c4939aa0..57eeb3a44 100644 --- a/sway/main.c +++ b/sway/main.c @@ -13,7 +13,6 @@ #include #include #include -#include "sway/commands.h" #include "sway/config.h" #include "sway/server.h" #include "sway/swaynag.h" @@ -23,7 +22,6 @@ #include "ipc-client.h" #include "log.h" #include "stringop.h" -#include "util.h" static bool terminate_request = false; static int exit_value = 0; @@ -296,7 +294,6 @@ int main(int argc, char **argv) { sway_log(SWAY_INFO, "wlroots version " WLR_VERSION_STR); log_kernel(); log_distro(); - log_env(); if (optind < argc) { // Behave as IPC client if (optind != 1) { @@ -346,6 +343,7 @@ int main(int argc, char **argv) { } ipc_init(&server); + log_env(); setenv("WAYLAND_DISPLAY", server.socket, true); if (!load_main_config(config_path, false, false)) {