X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions.c;h=1ec53287691b6748c8f31ad127024a7925d58922;hb=ec328fc04fe6e8d8c3d1ee386d4964963eb2ee17;hp=948ac2c09537357fd13a1a26b2e9c1ab86f01249;hpb=c716d1788bb4f4b9db403617023f06347ba48102;p=chaz%2Fopenbox diff --git a/openbox/actions.c b/openbox/actions.c index 948ac2c0..1ec53287 100644 --- a/openbox/actions.c +++ b/openbox/actions.c @@ -158,23 +158,21 @@ ObActionsAct* actions_parse_string(const gchar *name) if ((act = actions_build_act_from_string(name))) if (act->def->setup) - act->options = act->def->setup(NULL, NULL, NULL); + act->options = act->def->setup(NULL); return act; } -ObActionsAct* actions_parse(ObParseInst *i, - xmlDocPtr doc, - xmlNodePtr node) +ObActionsAct* actions_parse(xmlNodePtr node) { gchar *name; ObActionsAct *act = NULL; - if (parse_attr_string("name", node, &name)) { + if (obt_parse_attr_string(node, "name", &name)) { if ((act = actions_build_act_from_string(name))) /* there is more stuff to parse here */ if (act->def->setup) - act->options = act->def->setup(i, doc, node->xmlChildrenNode); + act->options = act->def->setup(node->children); g_free(name); }