summaryrefslogtreecommitdiff
path: root/openbox/actions/execute.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2009-12-21 14:04:39 -0500
committerDana Jansens <danakj@orodu.net>2009-12-21 14:08:38 -0500
commitb06b684589a618a2481ccc2745d5e03abb6bd5e0 (patch)
treef0a48ae7e8dd6fef771dcb1de8f7f49b9a8e0863 /openbox/actions/execute.c
parent04dc598a1fb195065403055fbb95589dd3511daa (diff)
rename the obt_parse library to obt_xml (since it is very xml specific)
Diffstat (limited to 'openbox/actions/execute.c')
-rw-r--r--openbox/actions/execute.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index bde7f5d2..77244d8f 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -43,27 +43,27 @@ static gpointer setup_func(xmlNodePtr node)
o = g_new0(Options, 1);
- if ((n = obt_parse_find_node(node, "command")) ||
- (n = obt_parse_find_node(node, "execute")))
+ if ((n = obt_xml_find_node(node, "command")) ||
+ (n = obt_xml_find_node(node, "execute")))
{
- gchar *s = obt_parse_node_string(n);
+ gchar *s = obt_xml_node_string(n);
o->cmd = obt_paths_expand_tilde(s);
g_free(s);
}
- if ((n = obt_parse_find_node(node, "prompt")))
- o->prompt = obt_parse_node_string(n);
+ if ((n = obt_xml_find_node(node, "prompt")))
+ o->prompt = obt_xml_node_string(n);
- if ((n = obt_parse_find_node(node, "startupnotify"))) {
+ if ((n = obt_xml_find_node(node, "startupnotify"))) {
xmlNodePtr m;
- if ((m = obt_parse_find_node(n->children, "enabled")))
- o->sn = obt_parse_node_bool(m);
- if ((m = obt_parse_find_node(n->children, "name")))
- o->sn_name = obt_parse_node_string(m);
- if ((m = obt_parse_find_node(n->children, "icon")))
- o->sn_icon = obt_parse_node_string(m);
- if ((m = obt_parse_find_node(n->children, "wmclass")))
- o->sn_wmclass = obt_parse_node_string(m);
+ if ((m = obt_xml_find_node(n->children, "enabled")))
+ o->sn = obt_xml_node_bool(m);
+ if ((m = obt_xml_find_node(n->children, "name")))
+ o->sn_name = obt_xml_node_string(m);
+ if ((m = obt_xml_find_node(n->children, "icon")))
+ o->sn_icon = obt_xml_node_string(m);
+ if ((m = obt_xml_find_node(n->children, "wmclass")))
+ o->sn_wmclass = obt_xml_node_string(m);
}
return o;
}