load_configuration: Remove conn argument

[i3/i3] / include / configuration.h

diff --git a/include/configuration.h b/include/configuration.h
index a1e9cc8029418d3fa8af098d70fd9bd2f84c71aa..1971146b81b738feed3ee12ae7003bb425a67451 100644 (file)
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -415,13 +415,13 @@ 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.
  *
  */
-void load_configuration(xcb_connection_t *conn, const char *override_configfile, bool reload);
+void load_configuration(const char *override_configfile, bool reload);
 
 /**
  * Ungrabs all keys, to be called before re-grabbing the keys because of a
@@ -434,15 +434,4 @@ void ungrab_all_keys(xcb_connection_t *conn);
  * Sends the current bar configuration as an event to all barconfig_update listeners.
  *
  */
-void update_barconfig();
-
-/**
- * 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);
+void update_barconfig(void);