From a5b02791d43cc68cc9686266f725be0fea7072fa Mon Sep 17 00:00:00 2001 From: Luminarys Date: Mon, 10 Aug 2015 19:50:22 -0500 Subject: Changed command handler to perform var subs on all cmd args Fixed workspace_next_name to use the first workspace name it can find in the config Minor fixes Changed command handler to perform var subs on all portions of a command Revert "Changed command handler to perform var subs on all portions of a command" This reverts commit fcfcffa1ea9819bcada6e6c85b40b21bf1b3a96e. Var sub fixes Minor fixes More minor fixes --- sway/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sway/main.c') diff --git a/sway/main.c b/sway/main.c index f84451de..a7814364 100644 --- a/sway/main.c +++ b/sway/main.c @@ -7,7 +7,6 @@ #include "log.h" #include "handlers.h" -struct sway_config *config; int main(int argc, char **argv) { init_log(L_DEBUG); // TODO: Control this with command line arg @@ -42,8 +41,8 @@ int main(int argc, char **argv) { if (!wlc_init(&interface, argc, argv)) { return 1; } - setenv("DISPLAY", ":1", 1); + if (!load_config()) { sway_abort("Unable to load config"); } -- cgit v1.2.3