From 90f7f1a0e61fa20ed1b74b9df057aa70abc791ed Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Tue, 5 Dec 2017 10:40:55 +0100
Subject: Add minimal config subsystem

---
 sway/main.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'sway/main.c')

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 @@
 #include <sys/capability.h>
 #include <sys/prctl.h>
 #endif
+#include "sway/config.h"
 #include "sway/server.h"
 #include "sway/layout.h"
 #include "sway/ipc-server.h"
@@ -388,14 +389,14 @@ int main(int argc, char **argv) {
 	ipc_init(&server);
 	log_env();
 
-	//if (validate) {
-	//	bool valid = load_main_config(config_path, false);
-	//	return valid ? 0 : 1;
-	//}
+	if (validate) {
+		bool valid = load_main_config(config_path, false);
+		return valid ? 0 : 1;
+	}
 
-	//if (!load_main_config(config_path, false)) {
-	//	sway_terminate(EXIT_FAILURE);
-	//}
+	if (!load_main_config(config_path, false)) {
+		sway_terminate(EXIT_FAILURE);
+	}
 
 	if (config_path) {
 		free(config_path);
@@ -411,9 +412,9 @@ int main(int argc, char **argv) {
 
 	ipc_terminate();
 
-	//if (config) {
-	//	free_config(config);
-	//}
+	if (config) {
+		free_config(config);
+	}
 
 	return exit_value;
 }
-- 
cgit v1.2.3