Merge branch 'master' into next

[i3/i3] / include / config_parser.h

diff --git a/include/config_parser.h b/include/config_parser.h
index 0daf8118ec75ebbd85ce92245180d86ff6d0d102..fb863f3bf7b8e366af6fb262c133503f116efa0c 100644 (file)
--- a/include/config_parser.h
+++ b/include/config_parser.h
@@ -12,6 +12,8 @@
 
 #include <yajl/yajl_gen.h>
 
+extern pid_t config_error_nagbar_pid;
+
 /*
  * The result of a parse_config call. Currently unused, but the JSON output
  * will be useful in the future when we implement a config parsing IPC command.
@@ -29,4 +31,11 @@ struct ConfigResult {
 
 struct ConfigResult *parse_config(const char *input, struct context *context);
 
+/**
+ * Parses the given file by first replacing the variables, then calling
+ * parse_config and possibly launching i3-nagbar.
+ *
+ */
+void parse_file(const char *f);
+
 #endif