From 22bf87253ddffa6a7225ecaad60c15cd0815c974 Mon Sep 17 00:00:00 2001 From: Marco Pesenti Gritti Date: Fri, 25 Apr 2003 11:40:44 +0000 Subject: Update from egg 2003-04-25 Marco Pesenti Gritti * data/ui/epiphany-toolbar.xml.in: * lib/egg/Makefile.am: * lib/egg/egg-editable-toolbar.c: * lib/egg/egg-editable-toolbar.h: * lib/egg/egg-menu-merge.c: * lib/egg/egg-radio-action.c: * lib/egg/eggmarshalers.c: * lib/egg/eggmarshalers.h: * lib/egg/eggmarshalers.list: * lib/egg/eggtoggletoolbutton.c: * lib/egg/eggtoggletoolbutton.h: * lib/egg/eggtoolbar.c: * lib/egg/eggtoolbar.h: * lib/egg/eggtoolbutton.c: * lib/egg/eggtoolbutton.h: * lib/egg/eggtoolitem.c: * lib/egg/eggtoolitem.h: * lib/egg/eggtreemodelfilter.c: Update from egg * src/Makefile.am: * src/ephy-location-action.c: (create_tool_item): * src/ephy-shell.c: (ephy_shell_init), (ephy_shell_get_bookmarks), * src/ephy-shell.h: * src/ephy-window.c: (setup_window), (ephy_window_finalize), (ephy_window_set_chrome): * src/toolbar.c: (toolbar_class_init), (toolbar_set_window), (topic_remove_cb), (bookmark_remove_cb), (toolbar_init), (toolbar_new): * src/window-commands.c: (window_cmd_edit_toolbar): Use the new toolbar editor api. This is incomplete, if you use bookmarks toolbars please still do not update. --- src/ephy-shell.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/ephy-shell.h') diff --git a/src/ephy-shell.h b/src/ephy-shell.h index ab4f3aa0e..6df099efb 100644 --- a/src/ephy-shell.h +++ b/src/ephy-shell.h @@ -25,6 +25,7 @@ #include "ephy-embed-shell.h" #include "session.h" #include "ephy-bookmarks.h" +#include "ephy-toolbars-model.h" #include #include @@ -94,6 +95,8 @@ EphyAutocompletion *ephy_shell_get_autocompletion (EphyShell *gs); EphyBookmarks *ephy_shell_get_bookmarks (EphyShell *gs); +EphyToolbarsModel *ephy_shell_get_toolbars_model (EphyShell *gs); + void ephy_shell_show_bookmarks_editor (EphyShell *gs); void ephy_shell_show_history_window (EphyShell *gs); -- cgit v1.2.3