From 7fe73f1990a361a3c794ef5517e2cb4d3188466e Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Thu, 23 Jan 2003 00:34:12 +0000 Subject: Fix autocompletion to not show duped entries. Complete print preview impl. 2003-01-23 Marco Pesenti Gritti * TODO: * lib/ephy-autocompletion.c: (ephy_autocompletion_reset), (ephy_autocompletion_set_key), (ephy_autocompletion_update_matches_full): * lib/widgets/ephy-location-entry.c: (get_editable_number_of_chars), (position_is_at_end), (ephy_location_entry_key_press_event_cb): * src/ephy-favicon-action.c: (ephy_favicon_action_finalize): * src/ephy-favorites-menu.c: (ephy_favorites_menu_finalize_impl), (ephy_favorites_menu_rebuild): * src/ephy-window.c: (add_widget), (setup_window), (ephy_window_finalize), (ephy_window_set_chrome): * src/ppview-toolbar.c: (toolbar_update_sensitivity), (ppview_toolbar_set_window), (toolbar_cmd_ppv_close): * src/toolbar.c: (toolbar_setup_widgets), (toolbar_finalize): Fix autocompletion to not show duped entries. Complete print preview impl. Fix actions referencing, a bug in egg still blocking it though. --- src/toolbar.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/toolbar.c') diff --git a/src/toolbar.c b/src/toolbar.c index e81163f86..c97311fc8 100755 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -29,6 +29,7 @@ #include "ephy-favicon-action.h" #include "ephy-navigation-action.h" #include "window-commands.h" +#include "ephy-debug.h" static void toolbar_class_init (ToolbarClass *klass); static void toolbar_init (Toolbar *t); @@ -150,8 +151,8 @@ toolbar_get_property (GObject *object, static void toolbar_setup_widgets (Toolbar *t) { - egg_menu_merge_add_ui_from_file (t->priv->ui_merge, - ephy_file ("epiphany-toolbar.xml"), NULL); + egg_menu_merge_add_ui_from_file + (t->priv->ui_merge, ephy_file ("epiphany-toolbar.xml"), NULL); egg_menu_merge_ensure_update (t->priv->ui_merge); } @@ -260,19 +261,24 @@ toolbar_finalize (GObject *object) { Toolbar *t; ToolbarPrivate *p; + EggMenuMerge *merge; g_return_if_fail (object != NULL); g_return_if_fail (IS_TOOLBAR (object)); t = TOOLBAR (object); p = t->priv; + merge = EGG_MENU_MERGE (t->priv->window->ui_merge); g_return_if_fail (p != NULL); g_object_unref (t->priv->action_group); + egg_menu_merge_remove_action_group (merge, t->priv->action_group); g_free (t->priv); + LOG ("Toolbar finalized") + G_OBJECT_CLASS (parent_class)->finalize (object); } -- cgit v1.2.3