summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-07-27 01:42:37 -0400
committerDana Jansens <danakj@orodu.net>2008-01-20 01:36:55 -0500
commit6653c9db22f47affbe5a189abcbde7786afe9413 (patch)
tree0863a0f84e0428fb44556056c51f6c28cca6c526
parentedeb0a2727dd9ca6fea0ba95dd87a48601da1304 (diff)
s/xmlChildrenNode/children/
-rw-r--r--openbox/actions.c2
-rw-r--r--openbox/actions/cyclewindows.c2
-rw-r--r--openbox/actions/directionalwindows.c2
-rw-r--r--openbox/actions/execute.c8
-rw-r--r--openbox/actions/if.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/openbox/actions.c b/openbox/actions.c
index 9ff20a41..0db82e01 100644
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -172,7 +172,7 @@ ObActionsAct* actions_parse(xmlNodePtr node)
if ((act = actions_build_act_from_string(name)))
/* there is more stuff to parse here */
if (act->def->setup)
- act->options = act->def->setup(node->xmlChildrenNode);
+ act->options = act->def->setup(node->children);
g_free(name);
}
diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 70f146af..672c9d00 100644
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -68,7 +68,7 @@ static gpointer setup_func(xmlNodePtr node)
if ((n = obt_parse_find_node(node, "finalactions"))) {
xmlNodePtr m;
- m = obt_parse_find_node(n->xmlChildrenNode, "action");
+ m = obt_parse_find_node(n->children, "action");
while (m) {
ObActionsAct *action = actions_parse(m);
if (action) o->actions = g_slist_prepend(o->actions, action);
diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c
index 05b841d3..b512fa24 100644
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@ -88,7 +88,7 @@ static gpointer setup_func(xmlNodePtr node)
if ((n = obt_parse_find_node(node, "finalactions"))) {
xmlNodePtr m;
- m = obt_parse_find_node(n->xmlChildrenNode, "action");
+ m = obt_parse_find_node(n->children, "action");
while (m) {
ObActionsAct *action = actions_parse(m);
if (action) o->actions = g_slist_prepend(o->actions, action);
diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index 51bcaac2..6b84ce40 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -45,13 +45,13 @@ static gpointer setup_func(xmlNodePtr node)
if ((n = obt_parse_find_node(node, "startupnotify"))) {
xmlNodePtr m;
- if ((m = obt_parse_find_node(n->xmlChildrenNode, "enabled")))
+ if ((m = obt_parse_find_node(n->children, "enabled")))
o->sn = obt_parse_node_bool(m);
- if ((m = obt_parse_find_node(n->xmlChildrenNode, "name")))
+ if ((m = obt_parse_find_node(n->children, "name")))
o->sn_name = obt_parse_node_string(m);
- if ((m = obt_parse_find_node(n->xmlChildrenNode, "icon")))
+ if ((m = obt_parse_find_node(n->children, "icon")))
o->sn_icon = obt_parse_node_string(m);
- if ((m = obt_parse_find_node(n->xmlChildrenNode, "wmclass")))
+ if ((m = obt_parse_find_node(n->children, "wmclass")))
o->sn_wmclass = obt_parse_node_string(m);
}
return o;
diff --git a/openbox/actions/if.c b/openbox/actions/if.c
index 8d2f281f..63a7fbcd 100644
--- a/openbox/actions/if.c
+++ b/openbox/actions/if.c
@@ -79,7 +79,7 @@ static gpointer setup_func(xmlNodePtr node)
if ((n = obt_parse_find_node(node, "then"))) {
xmlNodePtr m;
- m = obt_parse_find_node(n->xmlChildrenNode, "action");
+ m = obt_parse_find_node(n->children, "action");
while (m) {
ObActionsAct *action = actions_parse(m);
if (action) o->thenacts = g_slist_prepend(o->thenacts, action);
@@ -89,7 +89,7 @@ static gpointer setup_func(xmlNodePtr node)
if ((n = obt_parse_find_node(node, "else"))) {
xmlNodePtr m;
- m = obt_parse_find_node(n->xmlChildrenNode, "action");
+ m = obt_parse_find_node(n->children, "action");
while (m) {
ObActionsAct *action = actions_parse(m);
if (action) o->elseacts = g_slist_prepend(o->elseacts, action);