aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config.c
diff options
context:
space:
mode:
authorLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-10-08 09:56:34 -0400
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2018-10-08 09:59:38 -0400
commit09c3c33081a8b8c941cbc1eeab0e5a70e54d04ff (patch)
tree9f657329f7775cd764b60326a419d369eae8a605 /sway/config.c
parentMerge pull request #2793 from emersion/disable-swaybg (diff)
downloadsway-09c3c33081a8b8c941cbc1eeab0e5a70e54d04ff.tar.gz
sway-09c3c33081a8b8c941cbc1eeab0e5a70e54d04ff.tar.zst
sway-09c3c33081a8b8c941cbc1eeab0e5a70e54d04ff.zip
Allow swaynag to be disabled
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/config.c b/sway/config.c
index 7f29347a..e95c7b35 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -137,6 +137,7 @@ void free_config(struct sway_config *config) {
137 free(config->floating_scroll_right_cmd); 137 free(config->floating_scroll_right_cmd);
138 free(config->font); 138 free(config->font);
139 free(config->swaybg_command); 139 free(config->swaybg_command);
140 free(config->swaynag_command);
140 free((char *)config->current_config_path); 141 free((char *)config->current_config_path);
141 free((char *)config->current_config); 142 free((char *)config->current_config);
142 free(config); 143 free(config);
@@ -167,7 +168,7 @@ static void set_color(float dest[static 4], uint32_t color) {
167} 168}
168 169
169static void config_defaults(struct sway_config *config) { 170static void config_defaults(struct sway_config *config) {
170 config->swaynag_command = strdup("swaynag"); 171 if (!(config->swaynag_command = strdup("swaynag"))) goto cleanup;
171 config->swaynag_config_errors = (struct swaynag_instance){ 172 config->swaynag_config_errors = (struct swaynag_instance){
172 .args = "--type error " 173 .args = "--type error "
173 "--message 'There are errors in your config file' " 174 "--message 'There are errors in your config file' "