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

make the client list menu update properly and not crash

Browse source
This commit is contained in:
Dana Jansens 2007-05-23 04:08:16 +00:00
parent 1cafe0ba4c
commit e9115802d5
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
openbox/client_list_menu.c
View file

@ -136,33 +136,30 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data)
ObMenu *menu = frame->menu;
guint i;
GSList *it, *next;
it = desktop_menus;
for (i = 0; i < screen_num_desktops; ++i) {
if (!it) {
ObMenu *submenu;
gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i);
DesktopData *data = g_new(DesktopData, 1);
data->desktop = i;
submenu = menu_new(name, screen_desktop_names[i], FALSE, data);
menu_set_update_func(submenu, desk_menu_update);
menu_set_execute_func(submenu, desk_menu_execute);
menu_set_destroy_func(submenu, desk_menu_destroy);
menu_clear_entries(menu);
menu_add_submenu(menu, i, name);
g_free(name);
desktop_menus = g_slist_append(desktop_menus, submenu);
} else
it = g_slist_next(it);
while (desktop_menus) {
menu_free(desktop_menus->data);
desktop_menus = g_slist_delete_link(desktop_menus, desktop_menus);
}
for (; it; it = next, ++i) {
next = g_slist_next(it);
menu_free(it->data);
desktop_menus = g_slist_delete_link(desktop_menus, it);
menu_entry_remove(menu_find_entry_id(menu, i));
for (i = 0; i < screen_num_desktops; ++i) {
ObMenu *submenu;
gchar *name = g_strdup_printf("%s-%u", MENU_NAME, i);
DesktopData *data = g_new(DesktopData, 1);
data->desktop = i;
submenu = menu_new(name, screen_desktop_names[i], FALSE, data);
menu_set_update_func(submenu, desk_menu_update);
menu_set_execute_func(submenu, desk_menu_execute);
menu_set_destroy_func(submenu, desk_menu_destroy);
menu_add_submenu(menu, i, name);
g_free(name);
desktop_menus = g_slist_append(desktop_menus, submenu);
}
return TRUE; /* always show */