remove a bunch of g_new()/g_free() by returning Rect const*'s from screen area functi...

[chaz/openbox] / openbox / moveresize.c

diff --git a/openbox/moveresize.c b/openbox/moveresize.c
index 90e06c3619d4ec733dc7fbdde61ef5d600ec3306..6dcadd66cbf3c0d26f42567e6dfcef7723af592d 100644 (file)
--- a/openbox/moveresize.c
+++ b/openbox/moveresize.c
@@ -112,7 +112,7 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
                        c->frame->area.x + c->frame->area.width / 2,
                        c->frame->area.y + c->frame->area.height / 2);
     else /* Fixed */ {
-        Rect *area = screen_physical_area_active();
+        Rect const *area = screen_physical_area_active();
         gint gravity, x, y;
 
         x = config_resize_popup_fixed.x.pos;
@@ -157,8 +157,6 @@ static void popup_coords(ObClient *c, const gchar *format, gint a, gint b)
         }
 
         popup_position(popup, gravity, x, y);
-
-        g_free(area);
     }
     popup_show(popup, text);
     g_free(text);
@@ -556,7 +554,7 @@ static void do_edge_warp(gint x, gint y)
     dir = -1;
 
     for (i = 0; i < screen_num_monitors; ++i) {
-        Rect *a = screen_physical_area_monitor(i);
+        Rect const *a = screen_physical_area_monitor(i);
         if (x == RECT_LEFT(*a)) dir = OB_DIRECTION_WEST;
         if (x == RECT_RIGHT(*a)) dir = OB_DIRECTION_EAST;
         if (y == RECT_TOP(*a)) dir = OB_DIRECTION_NORTH;
@@ -573,7 +571,6 @@ static void do_edge_warp(gint x, gint y)
         {
             dir = -1;
         }
-        g_free(a);
     }
 
     if (dir != edge_warp_dir) {