X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fmovetoedge.c;h=f81ded41e0ee8a405f4b4c439e00c8f8e20b0947;hb=b06b684589a618a2481ccc2745d5e03abb6bd5e0;hp=51215fd2cab5ae9ebd74621887fe4eba625f8ab3;hpb=2f09e0ce388f63c341cb328d795766e2bd0dc24b;p=chaz%2Fopenbox

diff --git a/openbox/actions/movetoedge.c b/openbox/actions/movetoedge.c
index 51215fd2..f81ded41 100644
--- a/openbox/actions/movetoedge.c
+++ b/openbox/actions/movetoedge.c
@@ -19,16 +19,12 @@ static gpointer setup_west_func(xmlNodePtr node);
 
 void action_movetoedge_startup(void)
 {
-    actions_register("MoveToEdge", setup_func, g_free, run_func, NULL, NULL);
+    actions_register("MoveToEdge", setup_func, g_free, run_func);
     /* 3.4-compatibility */
-    actions_register("MoveToEdgeNorth", setup_north_func, g_free, run_func,
-                     NULL, NULL);
-    actions_register("MoveToEdgeSouth", setup_south_func, g_free, run_func,
-                     NULL, NULL);
-    actions_register("MoveToEdgeEast", setup_east_func, g_free, run_func,
-                     NULL, NULL);
-    actions_register("MoveToEdgeWest", setup_west_func, g_free, run_func,
-                     NULL, NULL);
+    actions_register("MoveToEdgeNorth", setup_north_func, g_free, run_func);
+    actions_register("MoveToEdgeSouth", setup_south_func, g_free, run_func);
+    actions_register("MoveToEdgeEast", setup_east_func, g_free, run_func);
+    actions_register("MoveToEdgeWest", setup_west_func, g_free, run_func);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -39,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;