From 4a2cacebf69d34ffd272871ffdfbe56028d8f7c2 Mon Sep 17 00:00:00 2001 From: Orestis Floros Date: Fri, 29 Mar 2019 02:15:49 +0200 Subject: [PATCH] load_configuration: Remove conn argument --- include/configuration.h | 2 +- src/commands.c | 2 +- src/config.c | 2 +- src/main.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configuration.h b/include/configuration.h index 65c08a8e..1971146b 100644 --- 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 3cf5a57c..69015d92 100644 --- 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 9787d985..22cdc096 100644 --- 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 0db5b440..d7d7530a 100644 --- 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 */ -- 2.39.2