summaryrefslogtreecommitdiff
path: root/openbox/menuframe.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2010-02-12 14:36:53 -0500
committerDana Jansens <danakj@orodu.net>2010-02-12 14:37:33 -0500
commitaeac3b735bf4caf7c014c58c1271b2cbe5aedd80 (patch)
treef727f835b505a3676c081698c5a77458b0e9ec1c /openbox/menuframe.c
parente61fd8874a8352fb5fa1c4b2ab84d29679fa7b0c (diff)
remove a bunch of g_new()/g_free() by returning Rect const*'s from screen area functions when possible
Diffstat (limited to 'openbox/menuframe.c')
-rw-r--r--openbox/menuframe.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index ac033f4b..d7f09aad 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -321,7 +321,7 @@ static void menu_frame_place_submenu(ObMenuFrame *self, gint *x, gint *y)
void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y,
gint *dx, gint *dy)
{
- Rect *a = NULL;
+ Rect const *a = NULL;
gint pos, half;
*dx = *dy = 0;
@@ -345,8 +345,6 @@ void menu_frame_move_on_screen(ObMenuFrame *self, gint x, gint y,
*dx = MAX(*dx, a->x - x);
*dy = MAX(*dy, a->y - y);
}
-
- g_free(a);
}
static void menu_entry_frame_render(ObMenuEntryFrame *self)
@@ -833,7 +831,7 @@ void menu_frame_render(ObMenuFrame *self)
static void menu_frame_update(ObMenuFrame *self)
{
GList *mit, *fit;
- Rect *a;
+ Rect const *a;
gint h;
menu_pipe_execute(self->menu);
@@ -931,8 +929,6 @@ static void menu_frame_update(ObMenuFrame *self)
}
}
- g_free(a);
-
menu_frame_render(self);
}