X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=inline;f=openbox%2Factions.c;h=0db82e014b29bdf81bce9c4864d5a2c18069c465;hb=6653c9db22f47affbe5a189abcbde7786afe9413;hp=0c84489a679f75b1d16c965b3f7b39d1db60b298;hpb=0be98fee4743c795b06aa23881b82eff5bab3ef6;p=chaz%2Fopenbox

diff --git a/openbox/actions.c b/openbox/actions.c
index 0c84489a..0db82e01 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);
     }