From 2db0d1ed3d15012d2d9c80d8d9499160e1f535dc Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 23 Jan 2003 13:22:17 +0000 Subject: Reimplement encoding menus. Work around eggmenu finalization problems. Fix 2003-01-23 Marco Pesenti Gritti * TODO: * data/ui/epiphany-ui.xml.in: * embed/ephy-embed-utils.c: (ephy_embed_utils_build_charsets_submenu): * lib/egg/egg-menu-merge.c: (egg_menu_merge_finalize), (egg_menu_merge_class_init), (egg_menu_merge_init), (egg_menu_merge_node_prepend_uierence), (egg_menu_merge_node_remove_uierence), (start_element_handler), (cleanup), (remove_ui), (update_node): * src/Makefile.am: * src/ephy-encoding-menu.c: (ephy_encoding_menu_class_init), (ephy_encoding_menu_init), (ephy_encoding_menu_finalize_impl), (ephy_encoding_menu_set_property), (ephy_encoding_menu_get_property), (ephy_encoding_menu_new), (ephy_encoding_menu_verb_cb), (build_group), (build_charset), (ephy_encoding_menu_rebuild): * src/ephy-encoding-menu.h: * src/ephy-favorites-menu.c: (ephy_favorites_menu_finalize_impl), (ephy_favorites_menu_verb_cb): * src/ephy-favorites-menu.h: * src/ephy-window.c: (ephy_window_init), (ephy_window_finalize): * src/ppview-toolbar.c: (ppview_toolbar_finalize): Reimplement encoding menus. Work around eggmenu finalization problems. Fix ppvtoolbar/favorites menu to correctly remove action group on finalize. --- embed/ephy-embed-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'embed/ephy-embed-utils.c') diff --git a/embed/ephy-embed-utils.c b/embed/ephy-embed-utils.c index e119d1f8a..8a8e116f7 100644 --- a/embed/ephy-embed-utils.c +++ b/embed/ephy-embed-utils.c @@ -244,7 +244,7 @@ ephy_embed_utils_build_charsets_submenu (BonoboUIComponent *ui_component, for (gl = groups; gl != NULL; gl = gl->next) { GList *charsets, *cl; - const char *group = (const char *)groups->data; + const char *group = (const char *)gl->data; build_group (xml_string, group, group_index); -- cgit v1.2.3