awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rename opts to awesome_opts

This commit is contained in:
Julien Danjou 2008-01-31 11:45:10 +01:00
parent 100d3437fc
commit c78f77543f
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/configopts.h
View File

@ -1,3 +1,4 @@
#include <confuse.h>
#include "rules.h" #include "rules.h"
#define AWESOME_CONFIG_FILE ".awesomerc" #define AWESOME_CONFIG_FILE ".awesomerc"
@ -247,7 +248,7 @@ static cfg_opt_t mouse_opts[] =
CFG_SEC((char *) "client", mouse_generic_opts, CFGF_MULTI), CFG_SEC((char *) "client", mouse_generic_opts, CFGF_MULTI),
CFG_END() CFG_END()
}; };
static cfg_opt_t opts[] = static cfg_opt_t awesome_opts[] =
{ {
CFG_SEC((char *) "screen", screen_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES), CFG_SEC((char *) "screen", screen_opts, CFGF_TITLE | CFGF_MULTI | CFGF_NO_TITLE_DUPES),
CFG_SEC((char *) "rules", rules_opts, CFGF_NONE), CFG_SEC((char *) "rules", rules_opts, CFGF_NONE),

6
config.c
View File

@ -452,7 +452,7 @@ config_check(const char *confpatharg)
int ret; int ret;
char *confpath; char *confpath;
cfg = cfg_init(opts, CFGF_NONE); cfg = cfg_init(awesome_opts, CFGF_NONE);
if(confpatharg) if(confpatharg)
confpath = a_strdup(confpatharg); confpath = a_strdup(confpatharg);
@ -496,7 +496,7 @@ config_parse(const char *confpatharg)
globalconf.configpath = a_strdup(confpath); globalconf.configpath = a_strdup(confpath);
cfg = cfg_init(opts, CFGF_NONE); cfg = cfg_init(awesome_opts, CFGF_NONE);
ret = cfg_parse(cfg, confpath); ret = cfg_parse(cfg, confpath);
@ -516,7 +516,7 @@ config_parse(const char *confpatharg)
{ {
warn("using default compile-time configuration\n"); warn("using default compile-time configuration\n");
cfg_free(cfg); cfg_free(cfg);
cfg = cfg_init(opts, CFGF_NONE); cfg = cfg_init(awesome_opts, CFGF_NONE);
cfg_parse_buf(cfg, AWESOME_DEFAULT_CONFIG); cfg_parse_buf(cfg, AWESOME_DEFAULT_CONFIG);
} }