X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions.c;h=10bf929a43de987f002a578c10526df5856f4469;hb=20b8fcfa33feeade5946bc7f3046705da5d164fe;hp=a236b581d60359328f645f4fe1a3765be4f258a4;hpb=d11ac82062d729be5d63c9c40c5c2bb312a8b8f1;p=chaz%2Fopenbox diff --git a/openbox/actions.c b/openbox/actions.c index a236b581..10bf929a 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); }