X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fmoverelative.c;h=ff9f719b98e6e9f335fd98ff2129d4709c0ee0bc;hb=b06b684589a618a2481ccc2745d5e03abb6bd5e0;hp=ccdff545d5702d02c4a470e98df31b3249c7e823;hpb=a1746ab2158da2324aefb7ce81e7b5edc9c41e79;p=chaz%2Fopenbox

diff --git a/openbox/actions/moverelative.c b/openbox/actions/moverelative.c
index ccdff545..ff9f719b 100644
--- a/openbox/actions/moverelative.c
+++ b/openbox/actions/moverelative.c
@@ -14,7 +14,7 @@ static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_moverelative_startup(void)
 {
-    actions_register("MoveRelative", setup_func, g_free, run_func, NULL, NULL);
+    actions_register("MoveRelative", setup_func, g_free, run_func);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -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;
 }
@@ -42,15 +42,15 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         gint x, y, lw, lh, w, h;
 
         c = data->client;
-        x = data->client->area.x + o->x;
-        y = data->client->area.y + o->y;
-        w = data->client->area.width;
-        h = data->client->area.height;
-        client_try_configure(data->client, &x, &y, &w, &h, &lw, &lh, TRUE);
-        client_find_onscreen(data->client, &x, &y, w, h, FALSE);
+        x = c->area.x + o->x;
+        y = c->area.y + o->y;
+        w = c->area.width;
+        h = c->area.height;
+        client_try_configure(c, &x, &y, &w, &h, &lw, &lh, TRUE);
+        client_find_onscreen(c, &x, &y, w, h, FALSE);
 
         actions_client_move(data, TRUE);
-        client_configure(data->client, x, y, w, h, TRUE, TRUE, FALSE);
+        client_configure(c, x, y, w, h, TRUE, TRUE, FALSE);
         actions_client_move(data, FALSE);
     }