diff options
| author | Marco Pesenti Gritti <marco@it.gnome.org> | 2003-01-23 21:22:17 +0800 |
|---|---|---|
| committer | Marco Pesenti Gritti <mpeseng@src.gnome.org> | 2003-01-23 21:22:17 +0800 |
| commit | 2db0d1ed3d15012d2d9c80d8d9499160e1f535dc (patch) | |
| tree | d2caa10c004ddf0196656611acd4c3b3e0e05c0c /src/ppview-toolbar.c | |
| parent | 7fe73f1990a361a3c794ef5517e2cb4d3188466e (diff) | |
| download | gsoc2013-epiphany-2db0d1ed3d15012d2d9c80d8d9499160e1f535dc.tar.gz gsoc2013-epiphany-2db0d1ed3d15012d2d9c80d8d9499160e1f535dc.tar.zst gsoc2013-epiphany-2db0d1ed3d15012d2d9c80d8d9499160e1f535dc.zip | |
Reimplement encoding menus. Work around eggmenu finalization problems. Fix
2003-01-23 Marco Pesenti Gritti <marco@it.gnome.org>
* 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.
Diffstat (limited to 'src/ppview-toolbar.c')
| -rwxr-xr-x | src/ppview-toolbar.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ppview-toolbar.c b/src/ppview-toolbar.c index 78b3b33d9..a97765930 100755 --- a/src/ppview-toolbar.c +++ b/src/ppview-toolbar.c @@ -26,10 +26,6 @@ #include <string.h> #include <bonobo/bonobo-i18n.h> -#include <bonobo/bonobo-window.h> -#include <bonobo/bonobo-control.h> -#include <bonobo/bonobo-ui-toolbar-button-item.h> -#include <bonobo/bonobo-property-bag.h> #include <gtk/gtkentry.h> #include <gtk/gtkmenu.h> @@ -275,7 +271,10 @@ ppview_toolbar_finalize (GObject *object) t = PPVIEW_TOOLBAR (object); g_return_if_fail (t->priv != NULL); + egg_menu_merge_remove_ui (t->priv->ui_merge, t->priv->ui_id); + egg_menu_merge_remove_action_group (t->priv->ui_merge, + t->priv->action_group); g_object_unref (t->priv->action_group); g_free (t->priv); |