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

Bugfix: correctly store the config path for using it for I3_CONFIG_PATH later

This commit is contained in:
Michael Stapelberg 2011-03-19 21:50:13 +01:00
parent 9344b9790c
commit 626c65b0d8
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/config.h
View File

@ -22,7 +22,7 @@
#include "i3.h" #include "i3.h"
typedef struct Config Config; typedef struct Config Config;
extern const char *saved_configpath; extern const char *current_configpath;
extern Config config; extern Config config;
extern SLIST_HEAD(modes_head, Mode) modes; extern SLIST_HEAD(modes_head, Mode) modes;

6
src/config.c
View File

@ -19,7 +19,7 @@
#include "all.h" #include "all.h"
const char *saved_configpath = NULL; const char *current_configpath = NULL;
Config config; Config config;
struct modes_head modes; struct modes_head modes;
@ -233,19 +233,23 @@ static char *get_config_path() {
* *
*/ */
static void parse_configuration(const char *override_configpath) { static void parse_configuration(const char *override_configpath) {
static const char *saved_configpath = NULL;
if (override_configpath != NULL) { if (override_configpath != NULL) {
saved_configpath = override_configpath; saved_configpath = override_configpath;
current_configpath = override_configpath;
parse_file(override_configpath); parse_file(override_configpath);
return; return;
} }
else if (saved_configpath != NULL) { else if (saved_configpath != NULL) {
current_configpath = saved_configpath;
parse_file(saved_configpath); parse_file(saved_configpath);
return; return;
} }
char *path = get_config_path(); char *path = get_config_path();
DLOG("Parsing configfile %s\n", path); DLOG("Parsing configfile %s\n", path);
current_configpath = path;
parse_file(path); parse_file(path);
free(path); free(path);
} }

2
src/main.c
View File

@ -355,7 +355,7 @@ int main(int argc, char *argv[]) {
(config.ipc_socket_path != NULL ? strlen(config.ipc_socket_path) : 0), (config.ipc_socket_path != NULL ? strlen(config.ipc_socket_path) : 0),
config.ipc_socket_path); config.ipc_socket_path);
xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8, xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8,
strlen(saved_configpath), saved_configpath); strlen(current_configpath), current_configpath);
keysyms = xcb_key_symbols_alloc(conn); keysyms = xcb_key_symbols_alloc(conn);