Merge branch 'backport' into work

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

diff --git a/openbox/actions/maximize.c b/openbox/actions/maximize.c
index 8bb0cc953e355b52a9595b659edd885b05cd04d9..45e8b38ed55801812a61f897c473fbd860c5db08 100644 (file)
--- a/openbox/actions/maximize.c
+++ b/openbox/actions/maximize.c
@@ -12,12 +12,12 @@ typedef struct {
     MaxDirection dir;
 } Options;
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_func(xmlNodePtr node);
 static gboolean run_func_on(ObActionsData *data, gpointer options);
 static gboolean run_func_off(ObActionsData *data, gpointer options);
 static gboolean run_func_toggle(ObActionsData *data, gpointer options);
 
-void action_maximize_startup()
+void action_maximize_startup(void)
 {
     actions_register("Maximize", setup_func, g_free, run_func_on,
                      NULL, NULL);
@@ -27,7 +27,7 @@ void action_maximize_startup()
                      NULL, NULL);
 }
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_func(xmlNodePtr node)
 {
     xmlNodePtr n;
     Options *o;
@@ -35,8 +35,8 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     o = g_new0(Options, 1);
     o->dir = BOTH;
 
-    if ((n = parse_find_node("direction", node))) {
-        gchar *s = parse_string(doc, n);
+    if ((n = obt_parse_find_node(node, "direction"))) {
+        gchar *s = obt_parse_node_string(n);
         if (!g_ascii_strcasecmp(s, "vertical") ||
             !g_ascii_strcasecmp(s, "vert"))
             o->dir = VERT;