summaryrefslogtreecommitdiff
path: root/openbox/menuframe.c
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2007-12-18 21:12:52 +0100
committerMikael Magnusson <mikachu@comhem.se>2007-12-18 21:12:52 +0100
commit2b8b5da04b14af1639143cc332874c7e1a03a8bb (patch)
tree74fc76cd53dc5684b8009960e896ecbc91cf0891 /openbox/menuframe.c
parent9586ad246dae1f1de89f2070722cfa0c0c41c477 (diff)
parent46f90bca8ab55a2f43bf33af1adf178bd0bd81d9 (diff)
Merge branch 'backport'
Diffstat (limited to 'openbox/menuframe.c')
-rw-r--r--openbox/menuframe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 2c666e3f..979e834f 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -637,9 +637,9 @@ void menu_frame_render(ObMenuFrame *self)
STRUT_SET(self->item_margin, 0, 0, 0, 0);
if (self->entries) {
- ObMenuEntryFrame *e = self->entries->data;
gint l, t, r, b;
+ e = self->entries->data;
e->a_text_normal->texture[0].data.text.string = "";
tw = RrMinWidth(e->a_text_normal);
tw += 2*PADDING;
@@ -1057,7 +1057,7 @@ static void menu_frame_hide(ObMenuFrame *self)
menu_frame_free(self);
}
-void menu_frame_hide_all()
+void menu_frame_hide_all(void)
{
GList *it;