From 7fcf1690b730892033993c1001c08666448f90b1 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@it.gnome.org>
Date: Fri, 25 Apr 2003 15:23:09 +0000
Subject: Get back toolbar editing functionalities. More work on the bookmarks

2003-04-25  Marco Pesenti Gritti  <marco@it.gnome.org>

	* data/ui/epiphany-toolbar.xml.in:
	* data/ui/epiphany-ui.xml.in:
	* lib/egg/egg-editable-toolbar.c: (egg_editable_toolbar_hide),
	(egg_editable_toolbar_set_drag_dest):
	* lib/egg/egg-editable-toolbar.h:
	* src/bookmarks/ephy-topic-action.c: (create_tool_item):
	* src/ephy-shell.c: (save_toolbars), (ephy_shell_finalize),
	(ephy_shell_get_toolbars_model):
	* src/ephy-toolbars-model.c: (impl_add_item),
	(ephy_toolbars_model_class_init):
	* src/ephy-toolbars-model.h:
	* src/ephy-window.c: (ephy_window_set_chrome):
	* src/toolbar.c: (ensure_bookmark_action), (toolbar_ensure_action),
	(action_added_cb), (init_bookmarks_toolbar), (toolbar_set_window),
	(toolbar_new), (toolbar_set_visibility):
	* src/toolbar.h:
	* src/window-commands.c: (toolbar_editor_destroy_cb),
	(window_cmd_edit_toolbar):

	Get back toolbar editing functionalities.
	More work on the bookmarks toolbars implementation.
	The toolbars context menus are regressed but it's not my fault :/
	The signal on EggToolbar is borked.
---
 data/ui/epiphany-toolbar.xml.in | 5 ++++-
 data/ui/epiphany-ui.xml.in      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/ui/epiphany-toolbar.xml.in b/data/ui/epiphany-toolbar.xml.in
index 43c800ad3..c0680a827 100644
--- a/data/ui/epiphany-toolbar.xml.in
+++ b/data/ui/epiphany-toolbar.xml.in
@@ -21,7 +21,7 @@
 	<toolitem verb="Spinner"/>
 	<toolitem verb="ToolbarGo"/>
 </available>
-<toolbar>
+<toolbar name="DefaultToolbar">
 	<toolitem verb="NavigationBack"/>
 	<toolitem verb="NavigationForward"/>
 	<toolitem verb="ViewStop"/>
@@ -33,5 +33,8 @@
 	<toolitem verb="Location"/>
 	<toolitem verb="Spinner"/>
 </toolbar>
+<toolbar name="BookmarksToolbar">
+	<toolitem verb="GoTopicId0"/>
+</toolbar>
 </editabletoolbar>
 
diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index dc8e97242..0da96aa19 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -33,6 +33,7 @@
 
 <submenu name="ViewMenu" verb="View">
 	<menuitem name="ViewToolbarMenu" verb="ViewToolbar"/>
+	<menuitem name="ViewBookmarksToolbarMenu" verb="ViewBookmarksToolbar"/>
 	<menuitem name="ViewStatusbarMenu" verb="ViewStatusbar"/>
 	<menuitem name="ViewFullscreenMenu" verb="ViewFullscreen"/>
 	<separator name="ViewSep1"/>
-- 
cgit v1.2.3