X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions.c;h=8f72714e9403026b55ddb5394b381ae941fd3fc6;hb=c70379fa8f771e499a4d47e84af06d71838b780d;hp=d43896d761cb429e70909f0807bb2c515232746b;hpb=2cb31da22c0a357a2251aabc660e0cc14b215d97;p=chaz%2Fopenbox diff --git a/openbox/actions.c b/openbox/actions.c index d43896d7..8f72714e 100644 --- a/openbox/actions.c +++ b/openbox/actions.c @@ -159,23 +159,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); }