load_configuration: Remove conn argument

diff --git a/include/configuration.h b/include/configuration.h
index 65c08a8e8dc689bd7fcae81d3226c9ed59e4c377..1971146b81b738feed3ee12ae7003bb425a67451 100644 (file)
--- a/include/configuration.h
+++ b/include/configuration.h
@@ -421,7 +421,7 @@ bool parse_configuration(const char *override_configpath, bool use_nagbar);
  * 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

diff --git a/src/commands.c b/src/commands.c
index 3cf5a57c480192806b2bb8c53b159941a210429f..69015d92ee43a14c96482a97786c2b5fb1bc1931 100644 (file)
--- a/src/commands.c
+++ b/src/commands.c
@@ -1573,7 +1573,7 @@ void cmd_reload(I3_CMD) {
     LOG("reloading\n");
     kill_nagbar(&config_error_nagbar_pid, false);
     kill_nagbar(&command_error_nagbar_pid, false);
-    load_configuration(conn, NULL, true);
+    load_configuration(NULL, true);
     x_set_i3_atoms();
     /* Send an IPC event just in case the ws names have changed */
     ipc_send_workspace_event("reload", NULL, NULL);

diff --git a/src/config.c b/src/config.c
index 9787d9855cd6146a558dd91e28c06b9993161ab4..22cdc09645a01d0b1c24612581648b69082c238a 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -73,7 +73,7 @@ bool parse_configuration(const char *override_configpath, bool use_nagbar) {
  * configuration file.
  *
  */
-void load_configuration(xcb_connection_t *conn, const char *override_configpath, bool reload) {
+void load_configuration(const char *override_configpath, bool reload) {
     if (reload) {
         /* If we are currently in a binding mode, we first revert to the
          * default since we have no guarantee that the current mode will even

diff --git a/src/main.c b/src/main.c
index 0db5b44076a88c5e35bd54379409291122b8d820..d7d7530a968ebc527d1ca60a13bb8241328cd71f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -586,7 +586,7 @@ int main(int argc, char *argv[]) {
 #include "atoms.xmacro"
 #undef xmacro
 
-    load_configuration(conn, override_configpath, false);
+    load_configuration(override_configpath, false);
 
     if (config.ipc_socket_path == NULL) {
         /* Fall back to a file name in /tmp/ based on the PID */