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/ephy-favorites-menu.c | |
| parent | 7fe73f1990a361a3c794ef5517e2cb4d3188466e (diff) | |
| download | gsoc2013-epiphany-2db0d1ed3d15012d2d9c80d8d9499160e1f535dc.tar gsoc2013-epiphany-2db0d1ed3d15012d2d9c80d8d9499160e1f535dc.tar.gz gsoc2013-epiphany-2db0d1ed3d15012d2d9c80d8d9499160e1f535dc.tar.bz2 gsoc2013-epiphany-2db0d1ed3d15012d2d9c80d8d9499160e1f535dc.tar.lz gsoc2013-epiphany-2db0d1ed3d15012d2d9c80d8d9499160e1f535dc.tar.xz 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/ephy-favorites-menu.c')
| -rw-r--r-- | src/ephy-favorites-menu.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/ephy-favorites-menu.c b/src/ephy-favorites-menu.c index 4c13072c8..c8be1e816 100644 --- a/src/ephy-favorites-menu.c +++ b/src/ephy-favorites-menu.c @@ -138,6 +138,14 @@ ephy_favorites_menu_finalize_impl (GObject *o) EphyFavoritesMenu *wrhm = EPHY_FAVORITES_MENU (o); EphyFavoritesMenuPrivate *p = wrhm->priv; + if (p->action_group != NULL) + { + egg_menu_merge_remove_action_group + (EGG_MENU_MERGE (p->window->ui_merge), + p->action_group); + g_object_unref (p->action_group); + } + g_free (p); G_OBJECT_CLASS (g_object_class)->finalize (o); @@ -186,9 +194,8 @@ ephy_favorites_menu_new (EphyWindow *window) } static void -ephy_favorites_menu_verb_cb (BonoboUIComponent *uic, - FavoriteData *data, - const char *cname) +ephy_favorites_menu_verb_cb (EggMenuMerge *merge, + FavoriteData *data) { ephy_window_load_url (data->window, data->url); } |