diff options
author | Michael Stapelberg <michael@stapelberg.de> | 2017-11-26 16:41:59 +0100 |
---|---|---|
committer | Michael Stapelberg <michael@stapelberg.de> | 2017-11-26 16:41:59 +0100 |
commit | c07936d91b38863f4e404a73aebe8a02820e4dfc (patch) | |
tree | 30eb65662358e3876dd8664b3186f5b981cab008 /i3-config-wizard | |
parent | 2eabfc88fea189906210d15d882a0bc713ead7d3 (diff) | |
download | i3-c07936d91b38863f4e404a73aebe8a02820e4dfc.tar.gz i3-c07936d91b38863f4e404a73aebe8a02820e4dfc.zip |
no-op refactoring: make ipc_connect find socket path
Diffstat (limited to 'i3-config-wizard')
-rw-r--r-- | i3-config-wizard/main.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c index dd58fd12..97c2a602 100644 --- a/i3-config-wizard/main.c +++ b/i3-config-wizard/main.c @@ -94,7 +94,7 @@ static xcb_get_modifier_mapping_reply_t *modmap_reply; static i3Font font; static i3Font bold_font; static int char_width; -static char *socket_path; +static char *socket_path = NULL; static xcb_window_t win; static surface_t surface; static xcb_key_symbols_t *symbols; @@ -744,7 +744,6 @@ static void finish() { int main(int argc, char *argv[]) { char *xdg_config_home; - socket_path = getenv("I3SOCK"); char *pattern = "pango:monospace 8"; char *patternbold = "pango:monospace bold 8"; int o, option_index = 0; @@ -824,12 +823,6 @@ int main(int argc, char *argv[]) { &xkb_base_error) != 1) errx(EXIT_FAILURE, "Could not setup XKB extension."); - if (socket_path == NULL) - socket_path = root_atom_contents("I3_SOCKET_PATH", conn, screen); - - if (socket_path == NULL) - socket_path = "/tmp/i3-ipc.sock"; - keysyms = xcb_key_symbols_alloc(conn); xcb_get_modifier_mapping_cookie_t modmap_cookie; modmap_cookie = xcb_get_modifier_mapping(conn); |