aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Dominique Martinet <asmadeus@codewreck.org>2017-12-29 11:29:13 +0100
committerLibravatar Dominique Martinet <asmadeus@codewreck.org>2018-01-05 00:07:34 +0100
commitf5b33cb4b62438bd084505ec0632bc7dbedc0acd (patch)
tree13bff87c2eb9d946edc5c4a6d31a2998b9ac4603
parentcmd_input: cleanup around current_input_config (diff)
downloadsway-f5b33cb4b62438bd084505ec0632bc7dbedc0acd.tar.gz
sway-f5b33cb4b62438bd084505ec0632bc7dbedc0acd.tar.zst
sway-f5b33cb4b62438bd084505ec0632bc7dbedc0acd.zip
fix typos in comments/messages; add shutting down message
-rw-r--r--sway/commands.c2
-rw-r--r--sway/config.c2
-rw-r--r--sway/main.c4
3 files changed, 5 insertions, 3 deletions
diff --git a/sway/commands.c b/sway/commands.c
index b7432bf6..c1c6dc5d 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -197,7 +197,7 @@ static struct cmd_handler *find_handler(char *line, enum cmd_status block) {
197struct cmd_results *handle_command(char *_exec) { 197struct cmd_results *handle_command(char *_exec) {
198 // Even though this function will process multiple commands we will only 198 // Even though this function will process multiple commands we will only
199 // return the last error, if any (for now). (Since we have access to an 199 // return the last error, if any (for now). (Since we have access to an
200 // error string we could e.g. concatonate all errors there.) 200 // error string we could e.g. concatenate all errors there.)
201 struct cmd_results *results = NULL; 201 struct cmd_results *results = NULL;
202 char *exec = strdup(_exec); 202 char *exec = strdup(_exec);
203 char *head = exec; 203 char *head = exec;
diff --git a/sway/config.c b/sway/config.c
index 312e0779..53a54a07 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -446,7 +446,7 @@ bool read_config(FILE *file, struct sway_config *config) {
446 break; 446 break;
447 447
448 case CMD_DEFER: 448 case CMD_DEFER:
449 sway_log(L_DEBUG, "Defferring command `%s'", line); 449 sway_log(L_DEBUG, "Deferring command `%s'", line);
450 list_add(config->cmd_queue, strdup(line)); 450 list_add(config->cmd_queue, strdup(line));
451 break; 451 break;
452 452
diff --git a/sway/main.c b/sway/main.c
index c18e2677..f2f24be3 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -380,7 +380,7 @@ int main(int argc, char **argv) {
380 // prevent ipc from crashing sway 380 // prevent ipc from crashing sway
381 signal(SIGPIPE, SIG_IGN); 381 signal(SIGPIPE, SIG_IGN);
382 382
383 wlr_log(L_INFO, "Starting sway version " SWAY_VERSION "\n"); 383 wlr_log(L_INFO, "Starting sway version " SWAY_VERSION);
384 384
385 init_layout(); 385 init_layout();
386 386
@@ -414,6 +414,8 @@ int main(int argc, char **argv) {
414 server_run(&server); 414 server_run(&server);
415 } 415 }
416 416
417 wlr_log(L_INFO, "Shutting down sway");
418
417 server_fini(&server); 419 server_fini(&server);
418 420
419 ipc_terminate(); 421 ipc_terminate();