Consistent use of the term "Bookmarks Bar" in the code, ui and schema.

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

	* data/epiphany.schemas.in:
	* data/ui/epiphany-bookmark-editor-ui.xml.in:
	* data/ui/epiphany-toolbar.xml.in:
	* data/ui/epiphany-ui.xml.in:
	* embed/ephy-embed-types.h:
	* embed/mozilla/mozilla-embed.cpp: (mozilla_embed_new_window_cb):
	* lib/ephy-prefs.h:
	* src/ephy-toolbars-model.c: (ephy_toolbars_model_remove_bookmark),
	(ephy_toolbars_model_add_bookmark), (ephy_toolbars_model_has_bookmark):
	* src/ephy-window.c: (save_window_chrome), (translate_default_chrome),
	(update_layout_toggles), (ephy_window_set_chrome):
	* src/toolbar.c: (init_bookmarks_toolbar), (toolbar_set_visibility):
	* src/window-commands.c: (window_cmd_view_bookmarks_bar):
	* src/window-commands.h:
	* src/bookmarks/ephy-bookmark-properties.c: (build_ui):
	* src/bookmarks/ephy-bookmarks-editor.c: (cmd_show_in_bookmarks_bar),
	(ephy_bookmarks_editor_update_menu):

	Consistent use of the term "Bookmarks Bar" in the code, ui and schema.
	Replaces "Bookmarks Toolbar" and "Personal Toolbar." You'll probably
	have to delete your epiphany-toolbar.xml file to get the bm toolbar to
	work now.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/ephy-window.c b/src/ephy-window.c
index 8152b0019..34cfc588c 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -129,9 +129,9 @@ static EggActionGroupEntry ephy_menu_entries [] = {
 	{ "ViewToolbar", N_("_Toolbar"), NULL, "<shift><control>T",
 	  N_("Show or hide toolbar"),
 	  G_CALLBACK (window_cmd_view_toolbar), NULL, TOGGLE_ACTION },
-	{ "ViewBookmarksToolbar", N_("_Bookmarks Toolbar"), NULL, NULL,
-	  N_("Show or hide bookmarks toolbar"),
-	  G_CALLBACK (window_cmd_view_bookmarks_toolbar), NULL, TOGGLE_ACTION },
+	{ "ViewBookmarksBar", N_("_Bookmarks Bar"), NULL, NULL,
+	  N_("Show or hide bookmarks bar"),
+	  G_CALLBACK (window_cmd_view_bookmarks_bar), NULL, TOGGLE_ACTION },
 	{ "ViewStatusbar", N_("St_atusbar"), NULL, NULL,
 	  N_("Show or hide statusbar"),
 	  G_CALLBACK (window_cmd_view_statusbar), NULL, TOGGLE_ACTION },
@@ -613,8 +613,8 @@ save_window_chrome (EphyWindow *window)
 	}
 	else
 	{
-		eel_gconf_set_boolean (CONF_WINDOWS_SHOW_PERSONAL_TOOLBAR,
-				       flags & EMBED_CHROME_PERSONALTOOLBARON);
+		eel_gconf_set_boolean (CONF_WINDOWS_SHOW_BOOKMARKS_BAR,
+				       flags & EMBED_CHROME_BOOKMARKSBARON);
 		eel_gconf_set_boolean (CONF_WINDOWS_SHOW_TOOLBARS,
 				       flags & EMBED_CHROME_TOOLBARON);
 		eel_gconf_set_boolean (CONF_WINDOWS_SHOW_STATUSBAR,
@@ -770,9 +770,9 @@ translate_default_chrome (EmbedChromeMask *chrome_mask)
 		{
 			*chrome_mask |= EMBED_CHROME_TOOLBARON;
 		}
-		if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_PERSONAL_TOOLBAR))
+		if (eel_gconf_get_boolean (CONF_WINDOWS_SHOW_BOOKMARKS_BAR))
 		{
-			*chrome_mask |= EMBED_CHROME_PERSONALTOOLBARON;
+			*chrome_mask |= EMBED_CHROME_BOOKMARKSBARON;
 		}
 
 		*chrome_mask |= EMBED_CHROME_MENUBARON;
@@ -790,9 +790,9 @@ update_layout_toggles (EphyWindow *window)
 	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action),
 				      mask & EMBED_CHROME_TOOLBARON);
 
-	action = egg_action_group_get_action (action_group, "ViewBookmarksToolbar");
+	action = egg_action_group_get_action (action_group, "ViewBookmarksBar");
 	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action),
-				      mask & EMBED_CHROME_PERSONALTOOLBARON);
+				      mask & EMBED_CHROME_BOOKMARKSBARON);
 
 	action = egg_action_group_get_action (action_group, "ViewStatusbar");
 	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action),
@@ -823,7 +823,7 @@ ephy_window_set_chrome (EphyWindow *window,
 
 	toolbar_set_visibility (window->priv->toolbar,
 				flags & EMBED_CHROME_TOOLBARON,
-				flags & EMBED_CHROME_PERSONALTOOLBARON);
+				flags & EMBED_CHROME_BOOKMARKSBARON);
 
 	if (flags & EMBED_CHROME_STATUSBARON)
 	{