From 80ca4ae3c2215e8af467c2c577581df841cd2ae6 Mon Sep 17 00:00:00 2001
From: Gustavo Noronha Silva <gns@gnome.org>
Date: Fri, 5 Feb 2010 15:36:08 -0200
Subject: Default to one toolbar with less buttons

This change follows from the GNOME decision to default to "Text
besides icons", which makes the first toolbar smaller
horizontally. With the woohoo bar the need for history and bookmark
buttons is also diminished, given that you can easily search them
using the location bar itself.

Zoom buttons are kept, but moved to the other side of the toolbar,
after the location bar, to clearly distinguish them from navigation
operations.

Bug #412385
---
 data/ui/epiphany-toolbar.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'data')

diff --git a/data/ui/epiphany-toolbar.xml b/data/ui/epiphany-toolbar.xml
index f30c32a06..80d74ed4f 100644
--- a/data/ui/epiphany-toolbar.xml
+++ b/data/ui/epiphany-toolbar.xml
@@ -29,16 +29,8 @@
 	<toolitem name="NavigationForward"/>
 	<toolitem name="ViewStop"/>
 	<toolitem name="ViewReload"/>
-	<separator/>
-	<toolitem name="GoHome"/>	
-	<toolitem name="GoHistory"/>
-	<toolitem name="GoBookmarks"/>
-	<separator/>
+	<toolitem name="Location"/>
 	<toolitem name="ViewZoomOut"/>
 	<toolitem name="ViewZoomIn"/>
 </toolbar>
-<toolbar name="EntryToolbar">
-	<toolitem name="Location"/>
-	<toolitem name="ToolbarGo"/>
-</toolbar>
 </toolbars>
-- 
cgit v1.2.3