X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fmovetoedge.c;h=ef5b69201f54f8229cb0a4e7c0ffabe347569b93;hb=HEAD;hp=e7384dadc277bb9f6faaf31e234e73a995449730;hpb=965ed8907a5dd81d5ffbc93b67a672fa78833854;p=chaz%2Fopenbox

diff --git a/openbox/actions/movetoedge.c b/openbox/actions/movetoedge.c
index e7384dad..ef5b6920 100644
--- a/openbox/actions/movetoedge.c
+++ b/openbox/actions/movetoedge.c
@@ -10,6 +10,7 @@ typedef struct {
 } Options;
 
 static gpointer setup_func(xmlNodePtr node);
+static void free_func(gpointer o);
 static gboolean run_func(ObActionsData *data, gpointer options);
 /* 3.4-compatibility */
 static gpointer setup_north_func(xmlNodePtr node);
@@ -19,12 +20,12 @@ static gpointer setup_west_func(xmlNodePtr node);
 
 void action_movetoedge_startup(void)
 {
-    actions_register("MoveToEdge", setup_func, g_free, run_func);
+    actions_register("MoveToEdge", setup_func, free_func, run_func);
     /* 3.4-compatibility */
-    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);
+    actions_register("MoveToEdgeNorth", setup_north_func, free_func, run_func);
+    actions_register("MoveToEdgeSouth", setup_south_func, free_func, run_func);
+    actions_register("MoveToEdgeEast", setup_east_func, free_func, run_func);
+    actions_register("MoveToEdgeWest", setup_west_func, free_func, run_func);
 }
 
 static gpointer setup_func(xmlNodePtr node)
@@ -32,11 +33,11 @@ static gpointer setup_func(xmlNodePtr node)
     xmlNodePtr n;
     Options *o;
 
-    o = g_new0(Options, 1);
+    o = g_slice_new0(Options);
     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;
@@ -55,6 +56,11 @@ static gpointer setup_func(xmlNodePtr node)
     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)
 {
@@ -77,28 +83,28 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 /* 3.4-compatibility */
 static gpointer setup_north_func(xmlNodePtr node)
 {
-    Options *o = g_new0(Options, 1);
+    Options *o = g_slice_new0(Options);
     o->dir = OB_DIRECTION_NORTH;
     return o;
 }
 
 static gpointer setup_south_func(xmlNodePtr node)
 {
-    Options *o = g_new0(Options, 1);
+    Options *o = g_slice_new0(Options);
     o->dir = OB_DIRECTION_SOUTH;
     return o;
 }
 
 static gpointer setup_east_func(xmlNodePtr node)
 {
-    Options *o = g_new0(Options, 1);
+    Options *o = g_slice_new0(Options);
     o->dir = OB_DIRECTION_EAST;
     return o;
 }
 
 static gpointer setup_west_func(xmlNodePtr node)
 {
-    Options *o = g_new0(Options, 1);
+    Options *o = g_slice_new0(Options);
     o->dir = OB_DIRECTION_WEST;
     return o;
 }