travis: install more perl dependencies, pull in trusty packages

[i3/i3] / include / config.h

diff --git a/include/config.h b/include/config.h
index b0f22417ab038715812c1c537ab43576909e7a02..afafb64be0cb8da35017684d0ec354e7cd03f50c 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -105,7 +105,7 @@ struct Config {
 
     /** By default, focus follows mouse. If the user explicitly wants to
      * turn this off (and instead rely only on the keyboard for changing
-     * focus), we allow him to do this with this relatively special option.
+     * focus), we allow them to do this with this relatively special option.
      * It is not planned to add any different focus models. */
     bool disable_focus_follows_mouse;
 
@@ -326,6 +326,20 @@ struct Barconfig {
     TAILQ_ENTRY(Barconfig) configs;
 };
 
+/**
+ * Finds the configuration file to use (either the one specified by
+ * override_configpath), the user’s one or the system default) and calls
+ * parse_file().
+ *
+ * If you specify override_configpath, only this path is used to look for a
+ * configuration file.
+ *
+ * If use_nagbar is false, don't try to start i3-nagbar but log the errors to
+ * stdout/stderr instead.
+ *
+ */
+bool parse_configuration(const char *override_configpath, bool use_nagbar);
+
 /**
  * Reads the configuration from ~/.i3/config or /etc/i3/config if not found.
  *