diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-04-26 02:10:15 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-04-26 02:10:15 +0000 |
| commit | 8c68c9ab0f75514ee4f0336e566ac2c02ac20b65 (patch) | |
| tree | 8dd8bc2a3cf2d0a8e7faa7ca6d6076ad48e8fcce /openbox/config.c | |
| parent | b6d2529acb6e31efbf8c7791e44905a1712da891 (diff) | |
fixes for new keybindings stuff/chroot/parsing
Diffstat (limited to 'openbox/config.c')
| -rw-r--r-- | openbox/config.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/openbox/config.c b/openbox/config.c index aadc4389..2ed6921e 100644 --- a/openbox/config.c +++ b/openbox/config.c @@ -278,6 +278,7 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, if (!parse_attr_string("key", node, &key)) return; + parse_attr_bool("chroot", node, &is_chroot); keylist = g_list_append(keylist, key); @@ -304,9 +305,6 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, g_free(key); keylist = g_list_delete_link(keylist, g_list_last(keylist)); - - /* go to next sibling */ - if (node->next) parse_key(i, doc, node->next, keylist); } static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, @@ -325,7 +323,10 @@ static void parse_keyboard(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, } if ((n = parse_find_node("keybind", node->children))) - parse_key(i, doc, n, NULL); + while (n) { + parse_key(i, doc, n, NULL); + n = parse_find_node("keybind", n->next); + } } /* |