update openbox to use the current parser interface in libobt

[chaz/openbox] / openbox / actions.c

diff --git a/openbox/actions.c b/openbox/actions.c
index cfe0bddededc336fc0f7b4f6065a59e14de3e894..9ff20a41b1a80ea7898a8746673e12d2bbcf00c4 100644 (file)
--- a/openbox/actions.c
+++ b/openbox/actions.c
@@ -124,7 +124,7 @@ static void actions_definition_unref(ObActionsDefinition *def)
     }
 }
 
-ObActionsAct* actions_build_act_from_string(const gchar *name)
+static ObActionsAct* actions_build_act_from_string(const gchar *name)
 {
     GSList *it;
     ObActionsDefinition *def = NULL;
@@ -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->xmlChildrenNode);
 
         g_free(name);
     }
@@ -275,12 +273,12 @@ void actions_run_acts(GSList *acts,
     }
 }
 
-gboolean actions_interactive_act_running()
+gboolean actions_interactive_act_running(void)
 {
     return interactive_act != NULL;
 }
 
-void actions_interactive_cancel_act()
+void actions_interactive_cancel_act(void)
 {
     if (interactive_act) {
         interactive_act->def->i_cancel(interactive_act->options);
@@ -306,7 +304,7 @@ static gboolean actions_interactive_begin_act(ObActionsAct *act, guint state)
         return FALSE;
 }
 
-static void actions_interactive_end_act()
+static void actions_interactive_end_act(void)
 {
     if (interactive_act) {
         ungrab_keyboard();