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.

7 files changed, 37 insertions, 37 deletions

diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index fe2b2df76..a82a5e727 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -405,7 +405,7 @@ build_ui (EphyBookmarkProperties *editor)
 	gtk_table_attach (GTK_TABLE (table), scrolled_window, 1, 2, 2, 3,
 			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 
-	checkbox = gtk_check_button_new_with_mnemonic (_("_Show in the bookmarks toolbar"));
+	checkbox = gtk_check_button_new_with_mnemonic (_("_Show in bookmarks bar"));
 	id = ephy_node_get_id (editor->priv->bookmark);
 	state = ephy_toolbars_model_has_bookmark (editor->priv->tb_model, FALSE, id);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), state);
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 306392abe..cf4c7c619 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -89,7 +89,7 @@ static void cmd_open_bookmarks_in_tabs    (EggAction *action,
 					   EphyBookmarksEditor *editor);
 static void cmd_open_bookmarks_in_browser (EggAction *action,
 					   EphyBookmarksEditor *editor);
-static void cmd_show_in_the_toolbar       (EggAction *action,
+static void cmd_show_in_bookmarks_bar     (EggAction *action,
 					   EphyBookmarksEditor *editor);
 static void cmd_delete			  (EggAction *action,
 				           EphyBookmarksEditor *editor);
@@ -158,9 +158,9 @@ static EggActionGroupEntry ephy_bookmark_popup_entries [] = {
 	{ "Delete", N_("_Delete"), GTK_STOCK_DELETE, NULL,
 	  N_("Delete the selected bookmark or topic"), 
 	  G_CALLBACK (cmd_delete), NULL },
-	{ "ShowInToolbar", N_("_Show in the Toolbar"), NULL, NULL,
-	  N_("Show the selected bookmark or topic in the bookmarks toolbar"), 
-	  G_CALLBACK (cmd_show_in_the_toolbar), NULL, TOGGLE_ACTION },
+	{ "ShowInBookmarksBar", N_("_Show in Bookmarks Bar"), NULL, NULL,
+	  N_("Show the selected bookmark or topic in the bookmarks bar"), 
+	  G_CALLBACK (cmd_show_in_bookmarks_bar), NULL, TOGGLE_ACTION },
 	{ "Properties", N_("_Properties"), GTK_STOCK_PROPERTIES, "<alt>Return",
 	  N_("View or modify the properties of the selected bookmark"), 
 	  G_CALLBACK (cmd_bookmark_properties), NULL },
@@ -250,8 +250,8 @@ get_target_window (EphyBookmarksEditor *editor)
 }
 
 static void
-cmd_show_in_the_toolbar (EggAction *action,
-		         EphyBookmarksEditor *editor)
+cmd_show_in_bookmarks_bar (EggAction *action,
+		           EphyBookmarksEditor *editor)
 {
 	EphyNode *node;
 	GList *selection;
@@ -592,7 +592,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
 	gboolean key_normal = FALSE;
 	gboolean bmk_multiple_selection;
 	gboolean cut, copy, paste, select_all;
-	gboolean can_show_in_toolbar, show_in_toolbar = FALSE;
+	gboolean can_show_in_bookmarks_bar, show_in_bookmarks_bar = FALSE;
 	EggActionGroup *action_group;
 	EggAction *action;
 	GList *selected;
@@ -642,7 +642,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
 		gulong id;
 
 		id = ephy_node_get_id (node);
-		show_in_toolbar = ephy_toolbars_model_has_bookmark
+		show_in_bookmarks_bar = ephy_toolbars_model_has_bookmark
 			(editor->priv->tb_model, TRUE, id);
 
 		priority = ephy_node_get_property_int
@@ -660,7 +660,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
 		gulong id;
 
 		id = ephy_node_get_id (node);
-		show_in_toolbar = ephy_toolbars_model_has_bookmark
+		show_in_bookmarks_bar = ephy_toolbars_model_has_bookmark
 			(editor->priv->tb_model, FALSE, id);
 
 		g_list_free (selected);
@@ -693,7 +693,7 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
 	delete = (bmk_focus && bmk_selection) ||
 		 (key_selection && key_focus && key_normal);
 	properties = (bmk_focus && bmk_selection && !bmk_multiple_selection);
-	can_show_in_toolbar = (bmk_focus && bmk_selection && !bmk_multiple_selection) ||
+	can_show_in_bookmarks_bar = (bmk_focus && bmk_selection && !bmk_multiple_selection) ||
 		 (key_selection && key_focus);
 
 	action_group = editor->priv->action_group;
@@ -718,17 +718,17 @@ ephy_bookmarks_editor_update_menu (EphyBookmarksEditor *editor)
 	g_object_set (action, "sensitive", paste, NULL);
 	action = egg_action_group_get_action (action_group, "SelectAll");
 	g_object_set (action, "sensitive", select_all, NULL);
-	action = egg_action_group_get_action (action_group, "ShowInToolbar");
-	g_object_set (action, "sensitive", can_show_in_toolbar, NULL);
+	action = egg_action_group_get_action (action_group, "ShowInBookmarksBar");
+	g_object_set (action, "sensitive", can_show_in_bookmarks_bar, NULL);
 
 	g_signal_handlers_block_by_func
 		(G_OBJECT (EGG_TOGGLE_ACTION (action)),
-		 G_CALLBACK (cmd_show_in_the_toolbar),
+		 G_CALLBACK (cmd_show_in_bookmarks_bar),
 		 editor);
-	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action), show_in_toolbar);
+	egg_toggle_action_set_active (EGG_TOGGLE_ACTION (action), show_in_bookmarks_bar);
 	g_signal_handlers_unblock_by_func
 		(G_OBJECT (EGG_TOGGLE_ACTION (action)),
-		 G_CALLBACK (cmd_show_in_the_toolbar),
+		 G_CALLBACK (cmd_show_in_bookmarks_bar),
 		 editor);
 }
 
diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c
index 8c3bc19fc..a256c485a 100755
--- a/src/ephy-toolbars-model.c
+++ b/src/ephy-toolbars-model.c
@@ -236,7 +236,7 @@ ephy_toolbars_model_remove_bookmark (EphyToolbarsModel *model,
 
 	action_name = get_action_name (topic, id);
 
-	toolbar_position = get_toolbar_pos (model, "BookmarksToolbar");
+	toolbar_position = get_toolbar_pos (model, "BookmarksBar");
 	g_return_if_fail (toolbar_position != -1);
 
 	position = get_item_pos (model, toolbar_position, action_name);
@@ -257,7 +257,7 @@ ephy_toolbars_model_add_bookmark (EphyToolbarsModel *model,
 
 	action_name = get_action_name (topic, id);
 
-	toolbar_position = get_toolbar_pos (model, "BookmarksToolbar");
+	toolbar_position = get_toolbar_pos (model, "BookmarksBar");
 	g_return_if_fail (toolbar_position != -1);
 
 	egg_toolbars_model_add_item (EGG_TOOLBARS_MODEL (model),
@@ -277,7 +277,7 @@ ephy_toolbars_model_has_bookmark (EphyToolbarsModel *model,
 
 	action_name = get_action_name (topic, id);
 
-	toolbar_position = get_toolbar_pos (model, "BookmarksToolbar");
+	toolbar_position = get_toolbar_pos (model, "BookmarksBar");
 	g_return_val_if_fail (toolbar_position != -1, FALSE);
 	position = get_item_pos (model, toolbar_position, action_name);
 
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)
 	{
diff --git a/src/toolbar.c b/src/toolbar.c
index 6b366f956..588eca2b0 100755
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -336,7 +336,7 @@ init_bookmarks_toolbar (Toolbar *t)
 			(EGG_TOOLBARS_MODEL (model), i);
 		g_return_if_fail (t_name != NULL);
 
-		if (strcmp (t_name, "BookmarksToolbar") == 0)
+		if (strcmp (t_name, "BookmarksBar") == 0)
 		{
 			egg_editable_toolbar_set_drag_dest
 				(EGG_EDITABLE_TOOLBAR (t),
@@ -656,7 +656,7 @@ toolbar_set_visibility (Toolbar *t,
 		t_name = egg_toolbars_model_toolbar_nth
 			(EGG_TOOLBARS_MODEL (model), i);
 		g_return_if_fail (t_name != NULL);
-		if (strcmp (t_name, "BookmarksToolbar") == 0)
+		if (strcmp (t_name, "BookmarksBar") == 0)
 		{
 			if (bmk_toolbars)
 			{
diff --git a/src/window-commands.c b/src/window-commands.c
index 557391704..ff7e55d15 100644
--- a/src/window-commands.c
+++ b/src/window-commands.c
@@ -485,8 +485,8 @@ window_cmd_edit_find_prev (EggAction *action,
 }
 
 void
-window_cmd_view_bookmarks_toolbar (EggAction *action,
-			           EphyWindow *window)
+window_cmd_view_bookmarks_bar (EggAction *action,
+			       EphyWindow *window)
 {
 	EmbedChromeMask mask;
 	gboolean active;
@@ -494,11 +494,11 @@ window_cmd_view_bookmarks_toolbar (EggAction *action,
 
 	mask = ephy_window_get_chrome (window);
 	active = EGG_TOGGLE_ACTION (action)->active;
-	current_state = (mask & EMBED_CHROME_PERSONALTOOLBARON) > 0;
+	current_state = (mask & EMBED_CHROME_BOOKMARKSBARON) > 0;
 
 	if (active != current_state)
 	{
-		mask ^= EMBED_CHROME_PERSONALTOOLBARON;
+		mask ^= EMBED_CHROME_BOOKMARKSBARON;
 		ephy_window_set_chrome (window, mask);
 	}
 }
diff --git a/src/window-commands.h b/src/window-commands.h
index 8594e791f..8b5ee56b4 100644
--- a/src/window-commands.h
+++ b/src/window-commands.h
@@ -104,8 +104,8 @@ void window_cmd_view_statusbar	(EggAction *action,
 void window_cmd_view_toolbar	(EggAction *action,
 				 EphyWindow *window);
 
-void window_cmd_view_bookmarks_toolbar	(EggAction *action,
-				         EphyWindow *window);
+void window_cmd_view_bookmarks_bar	(EggAction *action,
+				    	 EphyWindow *window);
 
 void window_cmd_view_fullscreen	(EggAction *action,
 				 EphyWindow *window);