rename the obt_parse library to obt_xml (since it is very xml specific)

19 files changed, 129 insertions, 129 deletions

diff --git a/openbox/actions/addremovedesktop.c b/openbox/actions/addremovedesktop.c
index 111742c1..e21e9e66 100644
--- a/openbox/actions/addremovedesktop.c
+++ b/openbox/actions/addremovedesktop.c
@@ -39,8 +39,8 @@ static gpointer setup_func(xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = obt_parse_find_node(node, "where"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "where"))) {
+        gchar *s = obt_xml_node_string(n);
         if (!g_ascii_strcasecmp(s, "last"))
             o->current = FALSE;
         else if (!g_ascii_strcasecmp(s, "current"))
diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 28618ef3..d1112242 100644
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -67,33 +67,33 @@ static gpointer setup_func(xmlNodePtr node,
     o->bar = TRUE;
     o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_LIST;
 
-    if ((n = obt_parse_find_node(node, "linear")))
-        o->linear = obt_parse_node_bool(n);
-    if ((n = obt_parse_find_node(node, "dialog"))) {
-        if (obt_parse_node_contains(n, "none"))
+    if ((n = obt_xml_find_node(node, "linear")))
+        o->linear = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "dialog"))) {
+        if (obt_xml_node_contains(n, "none"))
             o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_NONE;
-        else if (obt_parse_node_contains(n, "icons"))
+        else if (obt_xml_node_contains(n, "icons"))
             o->dialog_mode = OB_FOCUS_CYCLE_POPUP_MODE_ICONS;
     }
-    if ((n = obt_parse_find_node(node, "bar")))
-        o->bar = obt_parse_node_bool(n);
-    if ((n = obt_parse_find_node(node, "raise")))
-        o->raise = obt_parse_node_bool(n);
-    if ((n = obt_parse_find_node(node, "panels")))
-        o->dock_windows = obt_parse_node_bool(n);
-    if ((n = obt_parse_find_node(node, "desktop")))
-        o->desktop_windows = obt_parse_node_bool(n);
-    if ((n = obt_parse_find_node(node, "allDesktops")))
-        o->all_desktops = obt_parse_node_bool(n);
-
-    if ((n = obt_parse_find_node(node, "finalactions"))) {
+    if ((n = obt_xml_find_node(node, "bar")))
+        o->bar = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "raise")))
+        o->raise = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "panels")))
+        o->dock_windows = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "desktop")))
+        o->desktop_windows = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "allDesktops")))
+        o->all_desktops = obt_xml_node_bool(n);
+
+    if ((n = obt_xml_find_node(node, "finalactions"))) {
         xmlNodePtr m;
 
-        m = obt_parse_find_node(n->children, "action");
+        m = obt_xml_find_node(n->children, "action");
         while (m) {
             ObActionsAct *action = actions_parse(m);
             if (action) o->actions = g_slist_append(o->actions, action);
-            m = obt_parse_find_node(m->next, "action");
+            m = obt_xml_find_node(m->next, "action");
         }
     }
     else {
diff --git a/openbox/actions/debug.c b/openbox/actions/debug.c
index 3ae09016..9ba7b1b0 100644
--- a/openbox/actions/debug.c
+++ b/openbox/actions/debug.c
@@ -21,8 +21,8 @@ static gpointer setup_func(xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = obt_parse_find_node(node, "string")))
-        o->str = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "string")))
+        o->str = obt_xml_node_string(n);
     return o;
 }
 
diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 14f6ef20..5b0282cc 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -160,8 +160,8 @@ static gpointer setup_func(xmlNodePtr node,
     /* wrap by default - it's handy! */
     o->u.rel.wrap = TRUE;
 
-    if ((n = obt_parse_find_node(node, "to"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "to"))) {
+        gchar *s = obt_xml_node_string(n);
         if (!g_ascii_strcasecmp(s, "last"))
             o->type = LAST;
         else if (!g_ascii_strcasecmp(s, "next")) {
@@ -201,8 +201,8 @@ static gpointer setup_func(xmlNodePtr node,
         g_free(s);
     }
 
-    if ((n = obt_parse_find_node(node, "wrap")))
-        o->u.rel.wrap = obt_parse_node_bool(n);
+    if ((n = obt_xml_find_node(node, "wrap")))
+        o->u.rel.wrap = obt_xml_node_bool(n);
 
     return o;
 }
@@ -240,8 +240,8 @@ static gpointer setup_send_func(xmlNodePtr node,
     o->send = TRUE;
     o->follow = TRUE;
 
-    if ((n = obt_parse_find_node(node, "follow")))
-        o->follow = obt_parse_node_bool(n);
+    if ((n = obt_xml_find_node(node, "follow")))
+        o->follow = obt_xml_node_bool(n);
 
     if (o->type == RELATIVE && o->follow) {
         o->interactive = TRUE;
@@ -348,8 +348,8 @@ static gpointer setup_follow(xmlNodePtr node)
     Options *o = g_new0(Options, 1);
     o->send = TRUE;
     o->follow = TRUE;
-    if ((n = obt_parse_find_node(node, "follow")))
-        o->follow = obt_parse_node_bool(n);
+    if ((n = obt_xml_find_node(node, "follow")))
+        o->follow = obt_xml_node_bool(n);
     return o;
 }
 
@@ -372,8 +372,8 @@ static gpointer setup_go_abs_func(xmlNodePtr node)
     xmlNodePtr n;
     Options *o = g_new0(Options, 1);
     o->type = ABSOLUTE;
-    if ((n = obt_parse_find_node(node, "desktop")))
-        o->u.abs.desktop = obt_parse_node_int(n) - 1;
+    if ((n = obt_xml_find_node(node, "desktop")))
+        o->u.abs.desktop = obt_xml_node_int(n) - 1;
     else
         o->u.abs.desktop = screen_desktop;
     return o;
@@ -384,8 +384,8 @@ static gpointer setup_send_abs_func(xmlNodePtr node)
     xmlNodePtr n;
     Options *o = setup_follow(node);
     o->type = ABSOLUTE;
-    if ((n = obt_parse_find_node(node, "desktop")))
-        o->u.abs.desktop = obt_parse_node_int(n) - 1;
+    if ((n = obt_xml_find_node(node, "desktop")))
+        o->u.abs.desktop = obt_xml_node_int(n) - 1;
     else
         o->u.abs.desktop = screen_desktop;
     return o;
@@ -404,8 +404,8 @@ static void setup_rel(Options *o, xmlNodePtr node, gboolean lin,
     o->u.rel.dir = dir;
     o->u.rel.wrap = TRUE;
 
-    if ((n = obt_parse_find_node(node, "wrap")))
-        o->u.rel.wrap = obt_parse_node_bool(n);
+    if ((n = obt_xml_find_node(node, "wrap")))
+        o->u.rel.wrap = obt_xml_node_bool(n);
 
     if (input) {
         o->interactive = TRUE;
diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c
index 0d1476c7..2cca450c 100644
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@ -137,18 +137,18 @@ static gpointer setup_func(xmlNodePtr node)
     o->dialog = TRUE;
     o->bar = TRUE;
 
-    if ((n = obt_parse_find_node(node, "dialog")))
-        o->dialog = obt_parse_node_bool(n);
-    if ((n = obt_parse_find_node(node, "bar")))
-        o->bar = obt_parse_node_bool(n);
-    if ((n = obt_parse_find_node(node, "raise")))
-        o->raise = obt_parse_node_bool(n);
-    if ((n = obt_parse_find_node(node, "panels")))
-        o->dock_windows = obt_parse_node_bool(n);
-    if ((n = obt_parse_find_node(node, "desktop")))
-        o->desktop_windows = obt_parse_node_bool(n);
-    if ((n = obt_parse_find_node(node, "direction"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "dialog")))
+        o->dialog = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "bar")))
+        o->bar = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "raise")))
+        o->raise = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "panels")))
+        o->dock_windows = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "desktop")))
+        o->desktop_windows = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "direction"))) {
+        gchar *s = obt_xml_node_string(n);
         if (!g_ascii_strcasecmp(s, "north") ||
             !g_ascii_strcasecmp(s, "up"))
             o->direction = OB_DIRECTION_NORTH;
@@ -172,14 +172,14 @@ static gpointer setup_func(xmlNodePtr node)
         g_free(s);
     }
 
-    if ((n = obt_parse_find_node(node, "finalactions"))) {
+    if ((n = obt_xml_find_node(node, "finalactions"))) {
         xmlNodePtr m;
 
-        m = obt_parse_find_node(n->children, "action");
+        m = obt_xml_find_node(n->children, "action");
         while (m) {
             ObActionsAct *action = actions_parse(m);
             if (action) o->actions = g_slist_append(o->actions, action);
-            m = obt_parse_find_node(m->next, "action");
+            m = obt_xml_find_node(m->next, "action");
         }
     }
     else {
diff --git a/openbox/actions/execute.c b/openbox/actions/execute.c
index bde7f5d2..77244d8f 100644
--- a/openbox/actions/execute.c
+++ b/openbox/actions/execute.c
@@ -43,27 +43,27 @@ static gpointer setup_func(xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = obt_parse_find_node(node, "command")) ||
-        (n = obt_parse_find_node(node, "execute")))
+    if ((n = obt_xml_find_node(node, "command")) ||
+        (n = obt_xml_find_node(node, "execute")))
     {
-        gchar *s = obt_parse_node_string(n);
+        gchar *s = obt_xml_node_string(n);
         o->cmd = obt_paths_expand_tilde(s);
         g_free(s);
     }
 
-    if ((n = obt_parse_find_node(node, "prompt")))
-        o->prompt = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "prompt")))
+        o->prompt = obt_xml_node_string(n);
 
-    if ((n = obt_parse_find_node(node, "startupnotify"))) {
+    if ((n = obt_xml_find_node(node, "startupnotify"))) {
         xmlNodePtr m;
-        if ((m = obt_parse_find_node(n->children, "enabled")))
-            o->sn = obt_parse_node_bool(m);
-        if ((m = obt_parse_find_node(n->children, "name")))
-            o->sn_name = obt_parse_node_string(m);
-        if ((m = obt_parse_find_node(n->children, "icon")))
-            o->sn_icon = obt_parse_node_string(m);
-        if ((m = obt_parse_find_node(n->children, "wmclass")))
-            o->sn_wmclass = obt_parse_node_string(m);
+        if ((m = obt_xml_find_node(n->children, "enabled")))
+            o->sn = obt_xml_node_bool(m);
+        if ((m = obt_xml_find_node(n->children, "name")))
+            o->sn_name = obt_xml_node_string(m);
+        if ((m = obt_xml_find_node(n->children, "icon")))
+            o->sn_icon = obt_xml_node_string(m);
+        if ((m = obt_xml_find_node(n->children, "wmclass")))
+            o->sn_wmclass = obt_xml_node_string(m);
     }
     return o;
 }
diff --git a/openbox/actions/exit.c b/openbox/actions/exit.c
index 55d89a0b..f2b0cafb 100644
--- a/openbox/actions/exit.c
+++ b/openbox/actions/exit.c
@@ -25,8 +25,8 @@ static gpointer setup_func(xmlNodePtr node)
     o = g_new0(Options, 1);
     o->prompt = TRUE;
 
-    if ((n = obt_parse_find_node(node, "prompt")))
-        o->prompt = obt_parse_node_bool(n);
+    if ((n = obt_xml_find_node(node, "prompt")))
+        o->prompt = obt_xml_node_bool(n);
 
     return o;
 }
diff --git a/openbox/actions/focus.c b/openbox/actions/focus.c
index 0e546dea..40c2c80d 100644
--- a/openbox/actions/focus.c
+++ b/openbox/actions/focus.c
@@ -23,8 +23,8 @@ static gpointer setup_func(xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = obt_parse_find_node(node, "here")))
-        o->here = obt_parse_node_bool(n);
+    if ((n = obt_xml_find_node(node, "here")))
+        o->here = obt_xml_node_bool(n);
     return o;
 }
 
diff --git a/openbox/actions/growtoedge.c b/openbox/actions/growtoedge.c
index 0c39a63e..9589d3f6 100644
--- a/openbox/actions/growtoedge.c
+++ b/openbox/actions/growtoedge.c
@@ -41,8 +41,8 @@ static gpointer setup_func(xmlNodePtr node)
     o->dir = OB_DIRECTION_NORTH;
     o->shrink = FALSE;
 
-    if ((n = obt_parse_find_node(node, "direction"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "direction"))) {
+        gchar *s = obt_xml_node_string(n);
         if (!g_ascii_strcasecmp(s, "north") ||
             !g_ascii_strcasecmp(s, "up"))
             o->dir = OB_DIRECTION_NORTH;
diff --git a/openbox/actions/if.c b/openbox/actions/if.c
index 47ff2fd5..dd86086b 100644
--- a/openbox/actions/if.c
+++ b/openbox/actions/if.c
@@ -39,61 +39,61 @@ static gpointer setup_func(xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = obt_parse_find_node(node, "shaded"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "shaded"))) {
+        if (obt_xml_node_bool(n))
             o->shaded_on = TRUE;
         else
             o->shaded_off = TRUE;
     }
-    if ((n = obt_parse_find_node(node, "maximized"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "maximized"))) {
+        if (obt_xml_node_bool(n))
             o->maxfull_on = TRUE;
         else
             o->maxfull_off = TRUE;
     }
-    if ((n = obt_parse_find_node(node, "maximizedhorizontal"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "maximizedhorizontal"))) {
+        if (obt_xml_node_bool(n))
             o->maxhorz_on = TRUE;
         else
             o->maxhorz_off = TRUE;
     }
-    if ((n = obt_parse_find_node(node, "maximizedvertical"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "maximizedvertical"))) {
+        if (obt_xml_node_bool(n))
             o->maxvert_on = TRUE;
         else
             o->maxvert_off = TRUE;
     }
-    if ((n = obt_parse_find_node(node, "iconified"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "iconified"))) {
+        if (obt_xml_node_bool(n))
             o->iconic_on = TRUE;
         else
             o->iconic_off = TRUE;
     }
-    if ((n = obt_parse_find_node(node, "focused"))) {
-        if (obt_parse_node_bool(n))
+    if ((n = obt_xml_find_node(node, "focused"))) {
+        if (obt_xml_node_bool(n))
             o->focused = TRUE;
         else
             o->unfocused = TRUE;
     }
 
-    if ((n = obt_parse_find_node(node, "then"))) {
+    if ((n = obt_xml_find_node(node, "then"))) {
         xmlNodePtr m;
 
-        m = obt_parse_find_node(n->children, "action");
+        m = obt_xml_find_node(n->children, "action");
         while (m) {
             ObActionsAct *action = actions_parse(m);
             if (action) o->thenacts = g_slist_append(o->thenacts, action);
-            m = obt_parse_find_node(m->next, "action");
+            m = obt_xml_find_node(m->next, "action");
         }
     }
-    if ((n = obt_parse_find_node(node, "else"))) {
+    if ((n = obt_xml_find_node(node, "else"))) {
         xmlNodePtr m;
 
-        m = obt_parse_find_node(n->children, "action");
+        m = obt_xml_find_node(n->children, "action");
         while (m) {
             ObActionsAct *action = actions_parse(m);
             if (action) o->elseacts = g_slist_append(o->elseacts, action);
-            m = obt_parse_find_node(m->next, "action");
+            m = obt_xml_find_node(m->next, "action");
         }
     }
 
diff --git a/openbox/actions/layer.c b/openbox/actions/layer.c
index 1dc7c4cf..2b4d325a 100644
--- a/openbox/actions/layer.c
+++ b/openbox/actions/layer.c
@@ -55,8 +55,8 @@ static gpointer setup_func_send(xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = obt_parse_find_node(node, "layer"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "layer"))) {
+        gchar *s = obt_xml_node_string(n);
         if (!g_ascii_strcasecmp(s, "above") ||
             !g_ascii_strcasecmp(s, "top"))
             o->layer = 1;
diff --git a/openbox/actions/maximize.c b/openbox/actions/maximize.c
index 90a84039..4c615078 100644
--- a/openbox/actions/maximize.c
+++ b/openbox/actions/maximize.c
@@ -55,8 +55,8 @@ static gpointer setup_func(xmlNodePtr node)
     o = g_new0(Options, 1);
     o->dir = BOTH;
 
-    if ((n = obt_parse_find_node(node, "direction"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "direction"))) {
+        gchar *s = obt_xml_node_string(n);
         if (!g_ascii_strcasecmp(s, "vertical") ||
             !g_ascii_strcasecmp(s, "vert"))
             o->dir = VERT;
diff --git a/openbox/actions/moverelative.c b/openbox/actions/moverelative.c
index 5bcdda44..ff9f719b 100644
--- a/openbox/actions/moverelative.c
+++ b/openbox/actions/moverelative.c
@@ -24,10 +24,10 @@ static gpointer setup_func(xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = obt_parse_find_node(node, "x")))
-        o->x = obt_parse_node_int(n);
-    if ((n = obt_parse_find_node(node, "y")))
-        o->y = obt_parse_node_int(n);
+    if ((n = obt_xml_find_node(node, "x")))
+        o->x = obt_xml_node_int(n);
+    if ((n = obt_xml_find_node(node, "y")))
+        o->y = obt_xml_node_int(n);
 
     return o;
 }
diff --git a/openbox/actions/moveresizeto.c b/openbox/actions/moveresizeto.c
index 3c135c89..f0472797 100644
--- a/openbox/actions/moveresizeto.c
+++ b/openbox/actions/moveresizeto.c
@@ -38,7 +38,7 @@ void action_moveresizeto_startup(void)
 static void parse_coord(xmlNodePtr n, gint *pos,
                         gboolean *opposite, gboolean *center)
 {
-    gchar *s = obt_parse_node_string(n);
+    gchar *s = obt_xml_node_string(n);
     if (g_ascii_strcasecmp(s, "current") != 0) {
         if (!g_ascii_strcasecmp(s, "center"))
             *center = TRUE;
@@ -66,27 +66,27 @@ static gpointer setup_func(xmlNodePtr node)
     o->h = G_MININT;
     o->monitor = CURRENT_MONITOR;
 
-    if ((n = obt_parse_find_node(node, "x")))
+    if ((n = obt_xml_find_node(node, "x")))
         parse_coord(n, &o->x, &o->xopposite, &o->xcenter);
 
-    if ((n = obt_parse_find_node(node, "y")))
+    if ((n = obt_xml_find_node(node, "y")))
         parse_coord(n, &o->y, &o->yopposite, &o->ycenter);
 
-    if ((n = obt_parse_find_node(node, "width"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "width"))) {
+        gchar *s = obt_xml_node_string(n);
         if (g_ascii_strcasecmp(s, "current") != 0)
-            o->w = obt_parse_node_int(n);
+            o->w = obt_xml_node_int(n);
         g_free(s);
     }
-    if ((n = obt_parse_find_node(node, "height"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "height"))) {
+        gchar *s = obt_xml_node_string(n);
         if (g_ascii_strcasecmp(s, "current") != 0)
-            o->h = obt_parse_node_int(n);
+            o->h = obt_xml_node_int(n);
         g_free(s);
     }
 
-    if ((n = obt_parse_find_node(node, "monitor"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "monitor"))) {
+        gchar *s = obt_xml_node_string(n);
         if (g_ascii_strcasecmp(s, "current") != 0) {
             if (!g_ascii_strcasecmp(s, "all"))
                 o->monitor = ALL_MONITORS;
@@ -95,7 +95,7 @@ static gpointer setup_func(xmlNodePtr node)
             else if(!g_ascii_strcasecmp(s, "prev"))
                 o->monitor = PREV_MONITOR;
             else
-                o->monitor = obt_parse_node_int(n) - 1;
+                o->monitor = obt_xml_node_int(n) - 1;
         }
         g_free(s);
     }
diff --git a/openbox/actions/movetoedge.c b/openbox/actions/movetoedge.c
index e7384dad..f81ded41 100644
--- a/openbox/actions/movetoedge.c
+++ b/openbox/actions/movetoedge.c
@@ -35,8 +35,8 @@ static gpointer setup_func(xmlNodePtr node)
     o = g_new0(Options, 1);
     o->dir = OB_DIRECTION_NORTH;
 
-    if ((n = obt_parse_find_node(node, "direction"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "direction"))) {
+        gchar *s = obt_xml_node_string(n);
         if (!g_ascii_strcasecmp(s, "north") ||
             !g_ascii_strcasecmp(s, "up"))
             o->dir = OB_DIRECTION_NORTH;
diff --git a/openbox/actions/resize.c b/openbox/actions/resize.c
index 3df44b6c..fbcdf24a 100644
--- a/openbox/actions/resize.c
+++ b/openbox/actions/resize.c
@@ -27,8 +27,8 @@ static gpointer setup_func(xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = obt_parse_find_node(node, "edge"))) {
-        gchar *s = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "edge"))) {
+        gchar *s = obt_xml_node_string(n);
 
         o->corner_specified = TRUE;
         if (!g_ascii_strcasecmp(s, "top"))
diff --git a/openbox/actions/resizerelative.c b/openbox/actions/resizerelative.c
index b4db73b7..c5fc1ea1 100644
--- a/openbox/actions/resizerelative.c
+++ b/openbox/actions/resizerelative.c
@@ -26,16 +26,16 @@ static gpointer setup_func(xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = obt_parse_find_node(node, "left")))
-        o->left = obt_parse_node_int(n);
-    if ((n = obt_parse_find_node(node, "right")))
-        o->right = obt_parse_node_int(n);
-    if ((n = obt_parse_find_node(node, "top")) ||
-        (n = obt_parse_find_node(node, "up")))
-        o->top = obt_parse_node_int(n);
-    if ((n = obt_parse_find_node(node, "bottom")) ||
-        (n = obt_parse_find_node(node, "down")))
-        o->bottom = obt_parse_node_int(n);
+    if ((n = obt_xml_find_node(node, "left")))
+        o->left = obt_xml_node_int(n);
+    if ((n = obt_xml_find_node(node, "right")))
+        o->right = obt_xml_node_int(n);
+    if ((n = obt_xml_find_node(node, "top")) ||
+        (n = obt_xml_find_node(node, "up")))
+        o->top = obt_xml_node_int(n);
+    if ((n = obt_xml_find_node(node, "bottom")) ||
+        (n = obt_xml_find_node(node, "down")))
+        o->bottom = obt_xml_node_int(n);
 
     return o;
 }
diff --git a/openbox/actions/restart.c b/openbox/actions/restart.c
index 01de4f9a..7d1689cb 100644
--- a/openbox/actions/restart.c
+++ b/openbox/actions/restart.c
@@ -22,10 +22,10 @@ static gpointer setup_func(xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = obt_parse_find_node(node, "command")) ||
-        (n = obt_parse_find_node(node, "execute")))
+    if ((n = obt_xml_find_node(node, "command")) ||
+        (n = obt_xml_find_node(node, "execute")))
     {
-        gchar *s = obt_parse_node_string(n);
+        gchar *s = obt_xml_node_string(n);
         o->cmd = obt_paths_expand_tilde(s);
         g_free(s);
     }
diff --git a/openbox/actions/showmenu.c b/openbox/actions/showmenu.c
index 546be5a8..e60f1c69 100644
--- a/openbox/actions/showmenu.c
+++ b/openbox/actions/showmenu.c
@@ -22,8 +22,8 @@ static gpointer setup_func(xmlNodePtr node)
 
     o = g_new0(Options, 1);
 
-    if ((n = obt_parse_find_node(node, "menu")))
-        o->name = obt_parse_node_string(n);
+    if ((n = obt_xml_find_node(node, "menu")))
+        o->name = obt_xml_node_string(n);
     return o;
 }