Update configuration.h

- parse_configuration was mentioning outdated config file order
- kill_configerror_nagbar was not used anywhere
This commit is contained in:
Orestis Floros 2019-03-29 01:59:26 +02:00
parent 24a8eac134
commit f9c4011691
No known key found for this signature in database
GPG Key ID: E9AD9F32E401E38F
2 changed files with 4 additions and 12 deletions

View File

@ -415,7 +415,7 @@ struct tray_output_t {
bool parse_configuration(const char *override_configpath, bool use_nagbar); 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 * If you specify override_configpath, only this path is used to look for a
* configuration file. * configuration file.
@ -435,14 +435,3 @@ void ungrab_all_keys(xcb_connection_t *conn);
* *
*/ */
void update_barconfig(void); 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);

View File

@ -69,6 +69,9 @@ bool parse_configuration(const char *override_configpath, bool use_nagbar) {
/* /*
* (Re-)loads the configuration file (sets useful defaults before). * (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) { void load_configuration(xcb_connection_t *conn, const char *override_configpath, bool reload) {
if (reload) { if (reload) {