X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fresizerelative.c;h=1d42df2399e42e28123758c9bb60d9cc12fcabb0;hb=d179d6428ae585a3b8a13479bfe4586e41de2ff9;hp=5742e1fcff0a963e589aa370de47e6d11377c135;hpb=2f09e0ce388f63c341cb328d795766e2bd0dc24b;p=chaz%2Fopenbox

diff --git a/openbox/actions/resizerelative.c b/openbox/actions/resizerelative.c
index 5742e1fc..1d42df23 100644
--- a/openbox/actions/resizerelative.c
+++ b/openbox/actions/resizerelative.c
@@ -12,12 +12,12 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(xmlNodePtr node);
+static void     free_func(gpointer options);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_resizerelative_startup(void)
 {
-    actions_register("ResizeRelative", setup_func, g_free, run_func,
-                     NULL, NULL);
+    actions_register("ResizeRelative", setup_func, free_func, run_func);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -25,22 +25,27 @@ 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, "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;
 }
 
+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)
 {