Freeze break request to reverse a regression

[Peter Harvey <peter a harvey gmail com>]

Hello,

Epiphany used to add/remove bookmarks from the toolbar by use of a
checkbox in the bookmark manager. As part of an overhaul of the toolbar
code this feature was removed (the old implementation was functional but
flawed).

The attached patch reverses this regression so that existing (and new)
users can easily find that bookmarks and topics can be added to the
toolbar. It has maintainer approval.

Thanks,
Peter Harvey.

Index: src/bookmarks/ephy-bookmarks-editor.c
===================================================================
RCS file: /cvs/gnome/epiphany/src/bookmarks/ephy-bookmarks-editor.c,v
retrieving revision 1.185
diff -u -d -r1.185 ephy-bookmarks-editor.c
--- src/bookmarks/ephy-bookmarks-editor.c	24 Jan 2006 22:20:54 -0000	1.185
+++ src/bookmarks/ephy-bookmarks-editor.c	31 Jan 2006 13:17:31 -0000
@@ -49,6 +49,8 @@
 #include "ephy-bookmarks-import.h"
 #include "ephy-bookmarks-export.h"
 #include "ephy-bookmarks-ui.h"
+#include "ephy-bookmark-action.h"
+#include "ephy-topic-action.h"
 #include "ephy-node-common.h"
 #include "ephy-node-view.h"
 #include "ephy-window.h"
@@ -114,6 +116,8 @@
 					   EphyBookmarksEditor *editor);
 static void cmd_open_bookmarks_in_browser (GtkAction *action,
 					   EphyBookmarksEditor *editor);
+static void cmd_toolbar			  (GtkAction *action,
+					   EphyBookmarksEditor *editor);
 static void cmd_delete			  (GtkAction *action,
 					   EphyBookmarksEditor *editor);
 static void cmd_bookmark_properties	  (GtkAction *action,
@@ -229,6 +233,12 @@
 	  G_CALLBACK (window_cmd_help_about) },
 };
 
+static const GtkToggleActionEntry ephy_bookmark_toggle_entries [] = {
+	{ "ShowOnToolbar", NULL, N_("_Show on Toolbar"), NULL,
+	  N_("Show the selected bookmark on a toolbar"), 
+	  G_CALLBACK (cmd_toolbar), FALSE },
+};
+
 enum
 {
 	VIEW_TITLE,
@@ -417,6 +427,78 @@
 }
 
 static void
+cmd_toolbar (GtkAction *action,
+	     EphyBookmarksEditor *editor)
+{
+	EggToolbarsModel *model;
+	EphyNode *node;
+	gboolean show;
+	char *name;
+	GList *selection;
+	GList *l;
+	
+	model = EGG_TOOLBARS_MODEL (ephy_shell_get_toolbars_model (ephy_shell_get_default (), FALSE));
+	
+	if(egg_toolbars_model_n_toolbars (model) < 2)
+	{
+		egg_toolbars_model_add_toolbar (model, 1, "Bookmarks");
+	}
+	
+	if (ephy_node_view_is_target (EPHY_NODE_VIEW (editor->priv->bm_view)))
+	{
+		selection = ephy_node_view_get_selection (EPHY_NODE_VIEW (editor->priv->bm_view));
+		
+		node = selection->data;
+		name = ephy_bookmark_action_name (node);
+		show = (egg_toolbars_model_get_n_avail (model, name) >= 0);
+		g_free (name);
+
+		for (l = selection; l; l = l->next)
+		{
+			node = l->data;
+			name = ephy_bookmark_action_name (node);
+			if(show && egg_toolbars_model_get_n_avail (model, name) >= 0)
+			{
+				egg_toolbars_model_add_item (model, 1, -1, name);
+			}
+			else if(!show && egg_toolbars_model_get_n_avail (model, name) < 0)
+			{
+				egg_toolbars_model_delete_item (model, name);
+			}
+			g_free (name);
+		}
+
+		g_list_free (selection);
+	}
+	else if (ephy_node_view_is_target (EPHY_NODE_VIEW (editor->priv->key_view)))
+	{
+		selection = ephy_node_view_get_selection (EPHY_NODE_VIEW (editor->priv->key_view));
+	  
+		node = selection->data;
+		name = ephy_topic_action_name (node);
+		show = (egg_toolbars_model_get_n_avail (model, name) >= 0);
+		g_free (name);
+
+		for (l = selection; l; l = l->next)
+		{
+			node = l->data;
+			name = ephy_topic_action_name (node);
+			if(show && egg_toolbars_model_get_n_avail (model, name) >= 0)
+			{
+				egg_toolbars_model_add_item (model, 1, -1, name);
+			}
+			else if(!show && egg_toolbars_model_get_n_avail (model, name) < 0)
+			{
+				egg_toolbars_model_delete_item (model, name);
+			}
+			g_free (name);
+		}
+
+		g_list_free (selection);
+	}
+}
+
+static void
 cmd_delete (GtkAction *action,
 	    EphyBookmarksEditor *editor)
 {
@@ -1146,15 +1228,22 @@
 	gboolean key_normal = FALSE;
 	gboolean cut, copy, paste, select_all;
 	gboolean mutable = TRUE;
+	gboolean showtoolbar = FALSE;
+	gboolean ontoolbar = FALSE;
 
+	EggToolbarsModel *model;
 	GtkActionGroup *action_group;
 	GtkAction *action;
 	GList *selected;
 	GtkWidget *focus_widget;
 	int num_bmk_selected;
+	char *name;
 
 	LOG ("Update menu sensitivity");
 
+	model = EGG_TOOLBARS_MODEL (ephy_shell_get_toolbars_model 
+				    (ephy_shell_get_default(), FALSE));
+	
 	bmk_focus = ephy_node_view_is_target
 		(EPHY_NODE_VIEW (editor->priv->bm_view));
 	key_focus = ephy_node_view_is_target
@@ -1200,6 +1289,10 @@
 		if (priority == -1) priority = EPHY_NODE_NORMAL_PRIORITY;
 		key_normal = (priority == EPHY_NODE_NORMAL_PRIORITY);
 
+		name = ephy_topic_action_name (node);
+		ontoolbar = (egg_toolbars_model_get_n_avail (model, name) < 0);
+		g_free (name);
+
 		g_list_free (selected);
 	}
 
@@ -1213,6 +1306,10 @@
 
 		id = ephy_node_get_id (node);
 		mutable = !ephy_node_get_property_boolean (node, EPHY_NODE_BMK_PROP_IMMUTABLE);
+		
+		name = ephy_bookmark_action_name (node);
+		ontoolbar = (egg_toolbars_model_get_n_avail (model, name) < 0);
+		g_free (name);
 
 		g_list_free (selected);
 	}
@@ -1240,6 +1337,8 @@
 	delete = (bmk_focus && bmk_selection && mutable) ||
 		 (key_selection && key_focus && key_normal);
 	properties = bmk_focus && single_bmk_selected && mutable;
+	showtoolbar = (bmk_focus && bmk_selection) ||
+	              (key_focus && key_selection);
 
 	action_group = editor->priv->action_group;
 	action = gtk_action_group_get_action (action_group, "OpenInWindow");
@@ -1263,6 +1362,11 @@
 	gtk_action_set_sensitive (action, paste);
 	action = gtk_action_group_get_action (action_group, "SelectAll");
 	g_object_set (action, "sensitive", select_all, NULL);
+	action = gtk_action_group_get_action (action_group, "ShowOnToolbar");
+	gtk_action_set_sensitive (action, showtoolbar);
+	g_signal_handlers_block_by_func (action, cmd_toolbar, editor);
+	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), ontoolbar);
+	g_signal_handlers_unblock_by_func (action, cmd_toolbar, editor);
 }
 
 static gboolean
@@ -1609,6 +1713,8 @@
 	gtk_action_group_set_translation_domain (action_group, NULL);
 	gtk_action_group_add_actions (action_group, ephy_bookmark_popup_entries,
 				      G_N_ELEMENTS (ephy_bookmark_popup_entries), editor);
+	gtk_action_group_add_toggle_actions (action_group, ephy_bookmark_toggle_entries,
+					     G_N_ELEMENTS (ephy_bookmark_toggle_entries), editor);
 
 	details_value = get_details_value (editor);
 	gtk_action_group_add_radio_actions (action_group,