From aeac3b735bf4caf7c014c58c1271b2cbe5aedd80 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 12 Feb 2010 14:36:53 -0500 Subject: remove a bunch of g_new()/g_free() by returning Rect const*'s from screen area functions when possible --- openbox/popup.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'openbox/popup.c') diff --git a/openbox/popup.c b/openbox/popup.c index c7a01154..8793accc 100644 --- a/openbox/popup.c +++ b/openbox/popup.c @@ -158,7 +158,8 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) gint emptyx, emptyy; /* empty space between elements */ gint textx, texty, textw, texth; gint iconx, icony, iconw, iconh; - Rect *area, mon; + Rect const *area; + Rect mon; gboolean hasicon = self->hasicon; /* when there is no icon and the text is not parent relative, then @@ -259,8 +260,6 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) x=MAX(MIN(x, area->x+area->width-w),area->x); y=MAX(MIN(y, area->y+area->height-h),area->y); - g_free(area); - if (m == screen_num_monitors) { RECT_SET(mon, x, y, w, h); m = screen_find_monitor(&mon); @@ -270,8 +269,6 @@ void popup_delay_show(ObPopup *self, gulong usec, gchar *text) x=MAX(MIN(x, area->x+area->width-w),area->x); y=MAX(MIN(y, area->y+area->height-h),area->y); - - g_free(area); } /* set the windows/appearances up */ -- cgit v1.2.3