From: Dana Jansens <danakj@orodu.net>
Date: Thu, 26 Apr 2007 02:12:40 +0000 (+0000)
Subject: allow actions and chains at the same level
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=a65b1d202f11a0e1e87b9343a9a620321e84f6cf;p=chaz%2Fopenbox

allow actions and chains at the same level
---

diff --git a/openbox/config.c b/openbox/config.c
index 2ed6921e..36ee408c 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -283,13 +283,13 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 
     keylist = g_list_append(keylist, key);
 
-    /* a node either contains actions or key bindings */
     if ((n = parse_find_node("keybind", node->children))) {
         while (n) {
             parse_key(i, doc, n, keylist);
             n = parse_find_node("keybind", n->next);
         }
-    } else if ((n = parse_find_node("action", node->children))) {
+    }
+    if ((n = parse_find_node("action", node->children))) {
         while (n) {
             ObAction *action;