pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

module/i3: 'dynlist' -> 'workspaces'

Browse source
This commit is contained in:
Daniel Eklöf 2019-02-09 13:12:07 +01:00
parent 4100922b7a
commit be4765fadd
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/i3.c
View file

@ -903,7 +903,7 @@ from_conf(const struct yml_node *node, struct conf_inherit inherited)
const struct yml_dict_iter item = yml_dict_iter(it.node); const struct yml_dict_iter item = yml_dict_iter(it.node);
const char *key = yml_value_as_string(item.key); const char *key = yml_value_as_string(item.key);
if (strcmp(key, "dynlist") == 0) { if (strcmp(key, "workspaces") == 0) {
ws_root_node = item.value; ws_root_node = item.value;
} else { } else {
assert(label == NULL); assert(label == NULL);
@ -979,7 +979,7 @@ verify_content(keychain_t *chain, const struct yml_node *node)
if (!yml_is_dict(it.node) || yml_dict_length(it.node) != 1) { if (!yml_is_dict(it.node) || yml_dict_length(it.node) != 1) {
LOG_ERR( LOG_ERR(
"%s: item must be a dictionary with a single item; " "%s: item must be a dictionary with a single item; "
"either a 'dynlist', or a particle name", "either a 'workspaces', or a particle name",
conf_err_prefix(chain, it.node)); conf_err_prefix(chain, it.node));
return false; return false;
} }
@ -987,12 +987,13 @@ verify_content(keychain_t *chain, const struct yml_node *node)
const struct yml_dict_iter item = yml_dict_iter(it.node); const struct yml_dict_iter item = yml_dict_iter(it.node);
const char *key = yml_value_as_string(item.key); const char *key = yml_value_as_string(item.key);
if (key == NULL) { if (key == NULL) {
LOG_ERR("%s: key must be a string; either 'dynlist', or a particle name", LOG_ERR(
"%s: key must be a string; either 'workspaces', or a particle name",
conf_err_prefix(chain, item.key)); conf_err_prefix(chain, item.key));
return false; return false;
} }
if (strcmp(key, "dynlist") == 0) { if (strcmp(key, "workspaces") == 0) {
if (!verify_content_dynlist(chain_push(chain, key), item.value)) if (!verify_content_dynlist(chain_push(chain, key), item.value))
return false; return false;
chain_pop(chain); chain_pop(chain);