/* executes it using the client in the actions, since we set that
when we make the actions! */
-static void desk_menu_execute(ObMenuEntry *self, guint state, gpointer data,
+static void desk_menu_execute(ObMenuEntry *self, ObMenuFrame *f,
+ ObClient *c, guint state, gpointer data,
Time time)
{
ObAction *a;
}
for (; it; it = next, ++i) {
next = g_slist_next(it);
- menu_unref(it->data);
+ menu_free(it->data);
desktop_menus = g_slist_delete_link(desktop_menus, it);
menu_entry_remove(menu_find_entry_id(menu, i));
}
ObMenu *menu;
if (!reconfig)
- client_add_destructor(client_dest, NULL);
+ client_add_destroy_notify(client_dest, NULL);
menu = menu_new(MENU_NAME, _("Desktops"), TRUE, NULL);
menu_set_update_func(menu, self_update);
void client_list_menu_shutdown(gboolean reconfig)
{
if (!reconfig)
- client_remove_destructor(client_dest);
+ client_remove_destroy_notify(client_dest);
}