Update go menu to match the default toolbar layout.

2003-04-29  David Bordoley <bordoley@msu.edu>

	* data/ui/epiphany-ui.xml.in:

	Update go menu to match the default toolbar layout.

	* src/ephy-history-window.c: (build_search_box),
	(ephy_history_window_construct):
	* src/bookmarks/ephy-bookmarks-editor.c: (build_search_box ),
	(ephy_bookmarks_editor_construct):

	Remove unneccessary padding on the window. Add
	some padding around the search box.

4 files changed, 23 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b3ee785a..ba9159a79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-04-29  David Bordoley <bordoley@msu.edu>
+
+	* data/ui/epiphany-ui.xml.in:
+
+	Update go menu to match the default toolbar layout.
+
+	* src/ephy-history-window.c: (build_search_box), 
+	(ephy_history_window_construct):
+	* src/bookmarks/ephy-bookmarks-editor.c: (build_search_box ),
+	(ephy_bookmarks_editor_construct):
+
+	Remove unneccessary padding on the window. Add
+	some padding around the search box.
+
 2003-04-29  Marco Pesenti Gritti  <marco@it.gnome.org>
 
 	* embed/ephy-history.c: (remove_obsolete_pages),
diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index b954f76d7..13c9c7444 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -53,11 +53,11 @@
 	<menuitem name="GoForwardMenu" verb="GoForward"/>
 	<menuitem name="GoUpMenu" verb="GoUp"/>
 	<separator name="GoSep1"/>
-	<menuitem name="GoHomeMenu" verb="GoHome"/>
-	<menuitem name="GoLocationMenu" verb="GoLocation"/>
-	<separator name="GoSep2"/>
+	<menuitem name="GoHomeMenu" verb="GoHome"/>	
 	<menuitem name="GoHistoryMenu" verb="GoHistory"/>
 	<menuitem name="GoBookmarksMenu" verb="GoBookmarks"/>
+	<separator name="GoSep2"/>
+	<menuitem name="GoLocationMenu" verb="GoLocation"/>
 	<placeholder name="GoFavorites">
 	<separator name="GoSep3"/>
 	</placeholder>
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 8747bdcfe..dd6aa9158 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -1008,6 +1008,7 @@ build_search_box (EphyBookmarksEditor *editor)
 	char *str;
 
 	box = gtk_hbox_new (FALSE, 6);
+	gtk_container_set_border_width (GTK_CONTAINER (box), 6);
 	gtk_widget_show (box);
 
 	entry = gtk_entry_new ();
@@ -1149,7 +1150,7 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action), TRUE);
 
 	hpaned = gtk_hpaned_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (hpaned), 6);
+	gtk_container_set_border_width (GTK_CONTAINER (hpaned), 0);
 	gtk_container_add (GTK_CONTAINER (editor->priv->menu_dock), hpaned);
 	gtk_widget_show (hpaned);
 
@@ -1210,7 +1211,7 @@ ephy_bookmarks_editor_construct (EphyBookmarksEditor *editor)
 			  G_CALLBACK (keyword_node_show_popup_cb),
 			  editor);
 
-	vbox = gtk_vbox_new (FALSE, 6);
+	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_paned_pack2 (GTK_PANED (hpaned), vbox, TRUE, TRUE);
 	gtk_widget_show (vbox);
 
diff --git a/src/ephy-history-window.c b/src/ephy-history-window.c
index 3f4fd8540..120ab70e1 100644
--- a/src/ephy-history-window.c
+++ b/src/ephy-history-window.c
@@ -717,6 +717,7 @@ build_search_box (EphyHistoryWindow *editor)
 	char *str;
 
 	box = gtk_hbox_new (FALSE, 6);
+	gtk_container_set_border_width (GTK_CONTAINER (box), 6);
 	gtk_widget_show (box);
 
 	entry = gtk_entry_new ();
@@ -846,7 +847,7 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action), TRUE);
 
 	hpaned = gtk_hpaned_new ();
-	gtk_container_set_border_width (GTK_CONTAINER (hpaned), 6);
+	gtk_container_set_border_width (GTK_CONTAINER (hpaned), 0);
 	gtk_container_add (GTK_CONTAINER (editor->priv->menu_dock), hpaned);
 	gtk_widget_show (hpaned);
 
@@ -886,7 +887,7 @@ ephy_history_window_construct (EphyHistoryWindow *editor)
 			  G_CALLBACK (site_node_selected_cb),
 			  editor);
 
-	vbox = gtk_vbox_new (FALSE, 6);
+	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_paned_add2 (GTK_PANED (hpaned), vbox);
 	gtk_widget_show (vbox);