From 482cd2bcb05ed4245da0fecfb3a9ab8e67f99616 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 18 Jul 2003 13:10:24 +0000 Subject: Christian Persch 2003-07-18 Marco Pesenti Gritti Christian Persch * src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init), (ephy_bookmarks_find_bookmark): * src/ephy-toolbars-model.c: (ephy_toolbars_model_get_action_name), (topic_destroy_cb), (bookmark_destroy_cb), (setup_item), (impl_add_item), (ephy_toolbars_model_set_bookmarks), (ephy_toolbars_model_init), (get_toolbar_pos), (get_toolbar_and_item_pos), (ephy_toolbars_model_remove_bookmark), (ephy_toolbars_model_add_bookmark), (ephy_toolbars_model_has_bookmark): * src/ephy-toolbars-model.h: * src/toolbar.c: (topic_destroy_cb), (bookmark_destroy_cb): Remove bookmarks also if they are not on the bookmarks toolbar. Deal with bookmarks/model sync inside the model not in the toolbar. If there are invalid bookmarks in the toolbar configuration when loading it, emit a warning and drop them. --- src/toolbar.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/toolbar.c') diff --git a/src/toolbar.c b/src/toolbar.c index 2c5fe6a51..ae6a8f13f 100755 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -150,7 +150,6 @@ topic_destroy_cb (EphyNode *node, action = egg_action_group_get_action (t->priv->action_group, name); if (action) { - ephy_toolbars_model_remove_bookmark (model, TRUE, id); egg_action_group_remove_action (t->priv->action_group, action); } @@ -174,7 +173,6 @@ bookmark_destroy_cb (EphyNode *node, action = egg_action_group_get_action (t->priv->action_group, name); if (action) { - ephy_toolbars_model_remove_bookmark (model, FALSE, id); egg_action_group_remove_action (t->priv->action_group, action); } -- cgit