Remove add_icon_column func and add the functionality to the normal

2003-04-29  Marco Pesenti Gritti  <marco@it.gnome.org>

	* lib/widgets/ephy-node-view.c: (ephy_node_view_add_column):
	* lib/widgets/ephy-node-view.h:

	Remove add_icon_column func and add the functionality to the
	normal add_column. The icon will be packed in the same column.

	* src/bookmarks/ephy-bookmarks-editor.c:
	(entry_selection_changed_cb), (add_entry_monitor),
	(add_text_renderer_monitor), (cmd_add_topic), (cmd_rename),
	(build_search_box), (ephy_bookmarks_editor_construct),
	(toolbar_items_changed_cb), (ephy_bookmarks_editor_init):

	Fix for api change.

	Deal with 2 more sensitivity cases:
	bookmarks added by dnd to the toolbar and treeview text
	renderers.

	Remove hints until we have more columns.

	* src/ephy-history-window.c: (ephy_history_window_construct):

	Fix for new api

	* src/ephy-toolbars-model.c: (impl_add_item):

	Dont check if normal items are already in the toolbar:
	fix warnings.

1 files changed, 8 insertions, 4 deletions

diff --git a/src/ephy-toolbars-model.c b/src/ephy-toolbars-model.c
index f4fb3a0d2..43a081e22 100755
--- a/src/ephy-toolbars-model.c
+++ b/src/ephy-toolbars-model.c
@@ -78,7 +78,7 @@ impl_add_item (EggToolbarsModel *t,
 	EphyBookmarks *bookmarks;
 	char *action_name = NULL;
 	const char *res;
-	gboolean topic = FALSE;
+	gboolean topic = FALSE, normal_item = FALSE;
 	int id = -1;
 
 	LOG ("Add item %s", name)
@@ -88,7 +88,7 @@ impl_add_item (EggToolbarsModel *t,
 	if (gdk_atom_intern (EPHY_DND_TOPIC_TYPE, FALSE) == type)
 	{
 		GList *nodes;
-		
+
 		topic = TRUE;
 		nodes = ephy_dnd_node_list_extract_nodes (name);
 		id = ephy_node_get_id (EPHY_NODE (nodes->data));
@@ -99,16 +99,20 @@ impl_add_item (EggToolbarsModel *t,
 	{
 		GList *nodes;
 
-		topic = FALSE;
 		nodes = ephy_dnd_node_list_extract_nodes (name);
 		id = ephy_node_get_id (EPHY_NODE (nodes->data));
 		action_name = g_strdup_printf ("GoBookmarkId%d", id);
 		g_list_free (nodes);
 	}
+	else
+	{
+		normal_item = TRUE;
+	}
 
 	res = action_name ? action_name : name;
 
-	if (!ephy_toolbars_model_has_bookmark (EPHY_TOOLBARS_MODEL (t), topic, id))
+	if (normal_item ||
+	    !ephy_toolbars_model_has_bookmark (EPHY_TOOLBARS_MODEL (t), topic, id))
 	{
 		EGG_TOOLBARS_MODEL_CLASS (parent_class)->add_item
 			(t, toolbar_position, position, type, res);