Merge branch 'backport' into work

[chaz/openbox] / openbox / actions.c

diff --git a/openbox/actions.c b/openbox/actions.c
index b7ba5b44291c59a548a71dc3b00cf2e252544f63..6068f19c31d576856ae736bb92dd4d93db60c35d 100644 (file)
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -160,23 +160,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);
     }
@@ -350,7 +348,7 @@ void actions_client_move(ObActionsData *data, gboolean start)
         ignore_start = event_start_ignore_all_enters();
         if (replay_pointer) {
             /* replay the pointer event before any windows move */
-            XAllowEvents(ob_display, ReplayPointer, event_curtime);
+            XAllowEvents(obt_display, ReplayPointer, event_curtime);
             replay_pointer = FALSE;
         }
     }