nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

load_configuration: Remove conn argument

This commit is contained in:
Orestis Floros 2019-03-29 02:15:49 +02:00
parent f9c4011691
commit 4a2cacebf6
No known key found for this signature in database
GPG Key ID: E9AD9F32E401E38F
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/configuration.h
View File

@ -421,7 +421,7 @@ bool parse_configuration(const char *override_configpath, bool use_nagbar);
* configuration file. * 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 * Ungrabs all keys, to be called before re-grabbing the keys because of a

2
src/commands.c
View File

@ -1573,7 +1573,7 @@ void cmd_reload(I3_CMD) {
LOG("reloading\n"); LOG("reloading\n");
kill_nagbar(&config_error_nagbar_pid, false); kill_nagbar(&config_error_nagbar_pid, false);
kill_nagbar(&command_error_nagbar_pid, false); kill_nagbar(&command_error_nagbar_pid, false);
load_configuration(conn, NULL, true); load_configuration(NULL, true);
x_set_i3_atoms(); x_set_i3_atoms();
/* Send an IPC event just in case the ws names have changed */ /* Send an IPC event just in case the ws names have changed */
ipc_send_workspace_event("reload", NULL, NULL); ipc_send_workspace_event("reload", NULL, NULL);

2
src/config.c
View File

@ -73,7 +73,7 @@ bool parse_configuration(const char *override_configpath, bool use_nagbar) {
* configuration file. * 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 (reload) {
/* If we are currently in a binding mode, we first revert to the /* 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 * default since we have no guarantee that the current mode will even

2
src/main.c
View File

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