gchar **strippedlabel, guint *position,
gboolean *always_show);
-static void client_dest(ObClient *client, gpointer data)
-{
- /* menus can be associated with a client, so close any that are since
- we are disappearing now */
- menu_frame_hide_all_client(client);
-}
-
void menu_startup(gboolean reconfig)
{
gboolean loaded = FALSE;
}
g_assert(menu_parse_state.parent == NULL);
-
- if (!reconfig)
- client_add_destroy_notify(client_dest, NULL);
}
void menu_shutdown(gboolean reconfig)
{
- if (!reconfig)
- client_remove_destroy_notify(client_dest);
-
obt_xml_instance_unref(menu_parse_inst);
menu_parse_inst = NULL;
{
ObMenu *self;
- self = g_new0(ObMenu, 1);
+ self = g_slice_new0(ObMenu);
self->name = g_strdup(name);
self->data = data;
more_menu->more_menu will always be NULL, since there is only 1 for
each menu. */
- self->more_menu = g_new0(ObMenu, 1);
+ self->more_menu = g_slice_new0(ObMenu);
self->more_menu->name = _("More...");
self->more_menu->title = _("More...");
self->more_menu->data = data;
g_free(self->name);
g_free(self->title);
g_free(self->execute);
- g_free(self->more_menu);
+ g_slice_free(ObMenu, self->more_menu);
- g_free(self);
+ g_slice_free(ObMenu, self);
}
void menu_free(ObMenu *menu)
g_assert(menu);
- self = g_new0(ObMenuEntry, 1);
+ self = g_slice_new0(ObMenuEntry);
self->ref = 1;
self->type = type;
self->menu = menu;
break;
}
- g_free(self);
+ g_slice_free(ObMenuEntry, self);
}
}