Merge branch 'backport' into work

[chaz/openbox] / openbox / actions / showmenu.c

diff --git a/openbox/actions/showmenu.c b/openbox/actions/showmenu.c
index a36648a2651c9fca896d736697cc3c20b238b972..9590bd1589561eaedd7616606f3d1f5c38c7e4ed 100644 (file)
--- a/openbox/actions/showmenu.c
+++ b/openbox/actions/showmenu.c
@@ -6,25 +6,25 @@ typedef struct {
     gchar   *name;
 } Options;
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_func(xmlNodePtr node);
 static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_showmenu_startup()
+void action_showmenu_startup(void)
 {
     actions_register("ShowMenu", setup_func, free_func, run_func,
                      NULL, NULL);
 }
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_func(xmlNodePtr node)
 {
     xmlNodePtr n;
     Options *o;
 
     o = g_new0(Options, 1);
 
-    if ((n = parse_find_node("menu", node)))
-        o->name = parse_string(doc, n);
+    if ((n = obt_parse_find_node(node, "menu")))
+        o->name = obt_parse_node_string(n);
     return o;
 }