diff --git a/src/config.c b/src/config.c index 1e2b38e..0fe43a6 100644 --- a/src/config.c +++ b/src/config.c @@ -32,7 +32,7 @@ #include "wmfs.h" -func_name_list_t tmp_func_list[] = +const func_name_list_t func_list[] = { {"spawn", uicb_spawn }, {"client_kill", uicb_client_kill }, @@ -777,10 +777,6 @@ init_conf(void) } - /* Set func_list */ - func_list = emalloc(LEN(tmp_func_list), sizeof(func_name_list_t)); - memcpy(func_list, tmp_func_list, LEN(tmp_func_list) * sizeof(func_name_list_t)); - conf_misc_section(); conf_bar_section(); conf_root_section(); diff --git a/src/wmfs.c b/src/wmfs.c index cdbb923..422777c 100644 --- a/src/wmfs.c +++ b/src/wmfs.c @@ -104,7 +104,6 @@ quit(void) IFREE(spgeo); IFREE(infobar); IFREE(keys); - IFREE(func_list); IFREE(net_atom); /* Clean conf alloced thing */ diff --git a/src/wmfs.h b/src/wmfs.h index d6c88b9..bf54280 100644 --- a/src/wmfs.h +++ b/src/wmfs.h @@ -469,7 +469,7 @@ Client *clients; Client *sel; /* Other */ -func_name_list_t *func_list; +extern const func_name_list_t func_list[]; extern const func_name_list_t layout_list[]; uint numlockmask; Systray *trayicons;