diff options
| author | emersion <contact@emersion.fr> | 2018-11-28 17:13:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 17:13:24 +0100 |
| commit | ef18745951873025ec7fc44bd6987c39c3bdd0d7 (patch) | |
| tree | c6af192b469e6cf86ee00cb5d0ab4e03a98bacae /sway/commands | |
| parent | a22d0c0ff60469d57de733bb767333d5b222df2d (diff) | |
| parent | e5f90f25d755b19151dfcfd98790c1bad3eb8068 (diff) | |
| download | sway-ef18745951873025ec7fc44bd6987c39c3bdd0d7.tar.xz | |
Merge pull request #3202 from RedSoxFan/swaynag-config-warnings
Introduce a way to show config warnings in swaynag
Diffstat (limited to 'sway/commands')
| -rw-r--r-- | sway/commands/bind.c | 8 | ||||
| -rw-r--r-- | sway/commands/output/background.c | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sway/commands/bind.c b/sway/commands/bind.c index 34881b0f..9112815f 100644 --- a/sway/commands/bind.c +++ b/sway/commands/bind.c @@ -255,8 +255,12 @@ static struct cmd_results *cmd_bindsym_or_bindcode(int argc, char **argv, for (int i = 0; i < mode_bindings->length; ++i) { struct sway_binding *config_binding = mode_bindings->items[i]; if (binding_key_compare(binding, config_binding)) { - wlr_log(WLR_DEBUG, "overwriting old binding with command '%s'", - config_binding->command); + wlr_log(WLR_INFO, "Overwriting binding '%s' for device '%s' " + "from `%s` to `%s`", argv[0], binding->input, + binding->command, config_binding->command); + config_add_swaynag_warning("Overwriting binding '%s' for device " + "'%s' to `%s` from `%s`", argv[0], binding->input, + binding->command, config_binding->command); free_sway_binding(config_binding); mode_bindings->items[i] = binding; overwritten = true; diff --git a/sway/commands/output/background.c b/sway/commands/output/background.c index 30fb47c4..2cd1b76a 100644 --- a/sway/commands/output/background.c +++ b/sway/commands/output/background.c @@ -116,11 +116,8 @@ struct cmd_results *output_cmd_background(int argc, char **argv) { if (!can_access) { wlr_log(WLR_ERROR, "Unable to access background file '%s': %s", src, strerror(errno)); - if (config->reading && !config->validating) { - swaynag_log(config->swaynag_command, - &config->swaynag_config_errors, - "Unable to access background file '%s'", src); - } + config_add_swaynag_warning("Unable to access background file '%s'", + src); free(src); } else { // Escape double quotes in the final path for swaybg |