Update configuration.h

- parse_configuration was mentioning outdated config file order
- kill_configerror_nagbar was not used anywhere

diff --git a/include/configuration.h b/include/configuration.h
index 6f55ac2a57f7fe7ef280ca956267b46c63b82db9..65c08a8e8dc689bd7fcae81d3226c9ed59e4c377 100644 (file)
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -415,7 +415,7 @@ struct tray_output_t {
 bool parse_configuration(const char *override_configpath, bool use_nagbar);
 
 /**
- * Reads the configuration from ~/.i3/config or /etc/i3/config if not found.
+ * (Re-)loads the configuration file (sets useful defaults before).
  *
  * If you specify override_configpath, only this path is used to look for a
  * configuration file.
@@ -435,14 +435,3 @@ void ungrab_all_keys(xcb_connection_t *conn);
  *
  */
 void update_barconfig(void);
-
-/**
- * Kills the configerror i3-nagbar process, if any.
- *
- * Called when reloading/restarting.
- *
- * If wait_for_it is set (restarting), this function will waitpid(), otherwise,
- * ev is assumed to handle it (reloading).
- *
- */
-void kill_configerror_nagbar(bool wait_for_it);

diff --git a/src/config.c b/src/config.c
index 402771b1ffc95580f4ad7f26c06bf975a4b6ca65..9787d9855cd6146a558dd91e28c06b9993161ab4 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -69,6 +69,9 @@ bool parse_configuration(const char *override_configpath, bool use_nagbar) {
 /*
  * (Re-)loads the configuration file (sets useful defaults before).
  *
+ * If you specify override_configpath, only this path is used to look for a
+ * configuration file.
+ *
  */
 void load_configuration(xcb_connection_t *conn, const char *override_configpath, bool reload) {
     if (reload) {