diff options
author | 2017-12-05 10:40:55 +0100 | |
---|---|---|
committer | 2017-12-05 10:40:55 +0100 | |
commit | 90f7f1a0e61fa20ed1b74b9df057aa70abc791ed (patch) | |
tree | e201e4fb9fef471dd2fcf9581e26addfe3550502 /sway/main.c | |
parent | Merge pull request #1497 from emersion/cmd-exec (diff) | |
download | sway-90f7f1a0e61fa20ed1b74b9df057aa70abc791ed.tar.gz sway-90f7f1a0e61fa20ed1b74b9df057aa70abc791ed.tar.zst sway-90f7f1a0e61fa20ed1b74b9df057aa70abc791ed.zip |
Add minimal config subsystem
Diffstat (limited to 'sway/main.c')
-rw-r--r-- | sway/main.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sway/main.c b/sway/main.c index bc107309..bc843591 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -15,6 +15,7 @@ | |||
15 | #include <sys/capability.h> | 15 | #include <sys/capability.h> |
16 | #include <sys/prctl.h> | 16 | #include <sys/prctl.h> |
17 | #endif | 17 | #endif |
18 | #include "sway/config.h" | ||
18 | #include "sway/server.h" | 19 | #include "sway/server.h" |
19 | #include "sway/layout.h" | 20 | #include "sway/layout.h" |
20 | #include "sway/ipc-server.h" | 21 | #include "sway/ipc-server.h" |
@@ -388,14 +389,14 @@ int main(int argc, char **argv) { | |||
388 | ipc_init(&server); | 389 | ipc_init(&server); |
389 | log_env(); | 390 | log_env(); |
390 | 391 | ||
391 | //if (validate) { | 392 | if (validate) { |
392 | // bool valid = load_main_config(config_path, false); | 393 | bool valid = load_main_config(config_path, false); |
393 | // return valid ? 0 : 1; | 394 | return valid ? 0 : 1; |
394 | //} | 395 | } |
395 | 396 | ||
396 | //if (!load_main_config(config_path, false)) { | 397 | if (!load_main_config(config_path, false)) { |
397 | // sway_terminate(EXIT_FAILURE); | 398 | sway_terminate(EXIT_FAILURE); |
398 | //} | 399 | } |
399 | 400 | ||
400 | if (config_path) { | 401 | if (config_path) { |
401 | free(config_path); | 402 | free(config_path); |
@@ -411,9 +412,9 @@ int main(int argc, char **argv) { | |||
411 | 412 | ||
412 | ipc_terminate(); | 413 | ipc_terminate(); |
413 | 414 | ||
414 | //if (config) { | 415 | if (config) { |
415 | // free_config(config); | 416 | free_config(config); |
416 | //} | 417 | } |
417 | 418 | ||
418 | return exit_value; | 419 | return exit_value; |
419 | } | 420 | } |