From: Dana Jansens Date: Fri, 27 Jul 2007 05:42:37 +0000 (-0400) Subject: s/xmlChildrenNode/children/ X-Git-Tag: compgl~66 X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=commitdiff_plain;h=6653c9db22f47affbe5a189abcbde7786afe9413 s/xmlChildrenNode/children/ --- diff --git a/openbox/actions.c b/openbox/actions.c index 9ff20a4..0db82e0 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 70f146a..672c9d0 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 05b841d..b512fa2 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 51bcaac..6b84ce4 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 8d2f281..63a7fbc 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);