From 27ae6e03f698835c1683c03b7cfc0e401d0f601f Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Thu, 10 Jun 2004 19:05:53 +0000
Subject: Merging bookmarksbar-separation branch.

2004-06-10  Christian Persch  <chpe@cvs.gnome.org>

	Merging bookmarksbar-separation branch.
---
 data/ui/Makefile.am             | 1 +
 data/ui/epiphany-fs-toolbar.xml | 5 +++--
 data/ui/epiphany-toolbar.xml    | 8 +++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'data')

diff --git a/data/ui/Makefile.am b/data/ui/Makefile.am
index f834511cd..4fd9a45f2 100644
--- a/data/ui/Makefile.am
+++ b/data/ui/Makefile.am
@@ -1,5 +1,6 @@
 xmldir = $(pkgdatadir)
 xml_DATA = \
+	epiphany-bookmarksbar.xml	\
 	epiphany-fs-toolbar.xml		\
 	epiphany-bookmark-editor-ui.xml	\
 	epiphany-ui.xml			\
diff --git a/data/ui/epiphany-fs-toolbar.xml b/data/ui/epiphany-fs-toolbar.xml
index 2eec09e81..daca39b1f 100644
--- a/data/ui/epiphany-fs-toolbar.xml
+++ b/data/ui/epiphany-fs-toolbar.xml
@@ -1,4 +1,5 @@
-<editabletoolbar>
+<?xml version="1.0"?>
+<toolbars version="1.0">
 <toolbar name="Toolbar" style="icons-only">
 	<toolitem name="NavigationBack"/>
 	<toolitem name="NavigationForward"/>
@@ -7,4 +8,4 @@
 	<toolitem name="Location"/>
 	<toolitem name="Spinner"/>
 </toolbar>
-</editabletoolbar>
+</toolbars>
diff --git a/data/ui/epiphany-toolbar.xml b/data/ui/epiphany-toolbar.xml
index 030f2e987..b1cb0f73d 100644
--- a/data/ui/epiphany-toolbar.xml
+++ b/data/ui/epiphany-toolbar.xml
@@ -1,4 +1,5 @@
-<editabletoolbar>
+<?xml version="1.0"?>
+<toolbars version="1.0">
 <available>
 	<toolitem name="NavigationBack"/>
 	<toolitem name="NavigationForward"/>
@@ -38,7 +39,4 @@
 	<toolitem name="Location"/>
 	<toolitem name="ToolbarGo"/>
 </toolbar>
-<toolbar name="BookmarksBar">
-</toolbar>
-</editabletoolbar>
-
+</toolbars>
-- 
cgit v1.2.3