X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fmoveresizeto.c;h=ce50e9b902b65f446c9f64dff7725824a549ace9;hb=d179d6428ae585a3b8a13479bfe4586e41de2ff9;hp=f0472797d07e088501eb26cd85457bc63d0b00d6;hpb=b06b684589a618a2481ccc2745d5e03abb6bd5e0;p=chaz%2Fopenbox diff --git a/openbox/actions/moveresizeto.c b/openbox/actions/moveresizeto.c index f0472797..ce50e9b9 100644 --- a/openbox/actions/moveresizeto.c +++ b/openbox/actions/moveresizeto.c @@ -24,15 +24,16 @@ 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_center_func(xmlNodePtr node); void action_moveresizeto_startup(void) { - actions_register("MoveResizeTo", setup_func, g_free, run_func); + actions_register("MoveResizeTo", setup_func, free_func, run_func); /* 3.4-compatibility */ - actions_register("MoveToCenter", setup_center_func, g_free, run_func); + actions_register("MoveToCenter", setup_center_func, free_func, run_func); } static void parse_coord(xmlNodePtr n, gint *pos, @@ -59,7 +60,7 @@ static gpointer setup_func(xmlNodePtr node) xmlNodePtr n; Options *o; - o = g_new0(Options, 1); + o = g_slice_new0(Options); o->x = G_MININT; o->y = G_MININT; o->w = G_MININT; @@ -103,6 +104,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) { @@ -174,8 +180,8 @@ static gboolean run_func(ObActionsData *data, gpointer options) client_configure(c, x, y, w, h, TRUE, TRUE, FALSE); actions_client_move(data, FALSE); - g_free(area); - g_free(carea); + g_slice_free(Rect, area); + g_slice_free(Rect, carea); } return FALSE; @@ -186,7 +192,7 @@ static gpointer setup_center_func(xmlNodePtr node) { Options *o; - o = g_new0(Options, 1); + o = g_slice_new0(Options); o->x = G_MININT; o->y = G_MININT; o->w = G_MININT;