nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix a mem leak, and make suer the menus arent visible when they are modified

Browse source
This commit is contained in:
Dana Jansens 2003-09-14 21:04:30 +00:00
parent 25e1e32f54
commit abd2f914df
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
openbox/menu.c
View file

@ -161,6 +161,8 @@ void menu_pipe_execute(ObMenu *self)
} else { } else {
g_warning("Invalid output from pipe-menu: %s", self->execute); g_warning("Invalid output from pipe-menu: %s", self->execute);
} }
g_free(output);
} }
static ObMenu* menu_from_name(gchar *name) static ObMenu* menu_from_name(gchar *name)
@ -260,7 +262,17 @@ ObMenu* menu_new(gchar *name, gchar *title, gpointer data)
static void menu_destroy_hash_value(ObMenu *self) static void menu_destroy_hash_value(ObMenu *self)
{ {
/* XXX make sure its not visible */ /* make sure its not visible */
{
GList *it;
ObMenuFrame *f;
for (it = menu_frame_visible; it; it = g_list_next(it)) {
f = it->data;
if (f->menu == self)
menu_frame_hide_all();
}
}
if (self->destroy_func) if (self->destroy_func)
self->destroy_func(self, self->data); self->destroy_func(self, self->data);
@ -269,6 +281,8 @@ static void menu_destroy_hash_value(ObMenu *self)
g_free(self->name); g_free(self->name);
g_free(self->title); g_free(self->title);
g_free(self->execute); g_free(self->execute);
g_free(self);
} }
void menu_free(ObMenu *menu) void menu_free(ObMenu *menu)
@ -341,7 +355,18 @@ void menu_entry_free(ObMenuEntry *self)
void menu_clear_entries(ObMenu *self) void menu_clear_entries(ObMenu *self)
{ {
/* XXX assert that the menu isn't visible */ #ifdef DEBUG
/* assert that the menu isn't visible */
{
GList *it;
ObMenuFrame *f;
for (it = menu_frame_visible; it; it = g_list_next(it)) {
f = it->data;
g_assert(f->menu != self);
}
}
#endif
while (self->entries) { while (self->entries) {
menu_entry_free(self->entries->data); menu_entry_free(self->entries->data);