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

diff --git a/openbox/actions/moverelative.c b/openbox/actions/moverelative.c
index ccdff545..189b4dd0 100644
--- a/openbox/actions/moverelative.c
+++ b/openbox/actions/moverelative.c
@@ -10,11 +10,12 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(xmlNodePtr node);
+static void free_func(gpointer o);
 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, free_func, run_func);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -22,16 +23,21 @@ static gpointer setup_func(xmlNodePtr node)
     xmlNodePtr n;
     Options *o;
 
-    o = g_new0(Options, 1);
+    o = g_slice_new0(Options);
 
-    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;
 }
 
+static void free_func(gpointer o)
+{
+    g_slice_free(Options, o);
+}
+
 /* Always return FALSE because its not interactive */
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
@@ -42,15 +48,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);
     }