2003-07-27 Marco Pesenti Gritti <marco@it.gnome.org>

	* data/ui/epiphany-toolbar.xml.in:
	* lib/egg/egg-editable-toolbar.c: (drag_data_received_cb):
	* lib/egg/egg-editable-toolbar.h:
	* lib/egg/egg-toolbar-editor.c: (parse_item_list):
	* lib/egg/egg-toolbars-model.c: (egg_toolbars_model_to_xml),
	(safe_save_xml), (egg_toolbars_model_save), (toolbars_item_new),
	(free_item_node), (egg_toolbars_model_add_separator),
	(egg_toolbars_model_add_item), (parse_item_list),
	(impl_get_item_id), (impl_get_item_name), (impl_get_item_type),
	(egg_toolbars_model_class_init), (egg_toolbars_model_item_nth),
	(egg_toolbars_model_toolbar_nth), (egg_toolbars_model_get_item_id),
	(egg_toolbars_model_get_item_name),
	(egg_toolbars_model_get_item_type):
	* lib/egg/egg-toolbars-model.h:
	* lib/egg/eggtoolbar.c: (egg_toolbar_finalize):
	* lib/ephy-dnd.c: (add_one_topic), (ephy_dnd_drag_data_get):
	* lib/ephy-dnd.h:
	* lib/widgets/ephy-node-view.c: (drag_data_received_cb),
	(ephy_node_view_select_node_by_key), (ephy_node_view_construct),
	(ephy_node_view_add_data_column),
	(ephy_node_view_enable_drag_source):
	* lib/widgets/ephy-node-view.h:
	* lib/widgets/ephy-tree-model-sort.c:
	(ephy_tree_model_sort_class_init), (ephy_tree_model_sort_init),
	(ephy_tree_model_sort_multi_row_draggable),
	(ephy_tree_model_sort_set_column_id),
	(each_property_get_data_binder),
	(ephy_tree_model_sort_multi_drag_data_get):
	* lib/widgets/ephy-tree-model-sort.h:
	* src/bookmarks/ephy-bookmark-properties.c:
	(toolbar_checkbox_changed_cb), (build_ui):
	* src/bookmarks/ephy-bookmarks-editor.c:
	(cmd_show_in_bookmarks_bar), (ephy_bookmarks_editor_update_menu),
	(node_dropped_cb), (provide_keyword_uri),
	(ephy_bookmarks_editor_construct):
	* src/bookmarks/ephy-bookmarks.c: (ephy_bookmarks_init_defaults),
	(ephy_bookmarks_remove_keyword), (ephy_bookmarks_get_topic_uri),
	(ephy_bookmarks_find_keyword):
	* src/bookmarks/ephy-bookmarks.h:
	* src/ephy-history-window.c: (ephy_history_window_construct):
	* src/ephy-toolbars-model.c: (ephy_toolbars_model_get_action_name),
	(ephy_toolbars_model_get_node), (bookmark_destroy_cb),
	(impl_get_item_name), (impl_get_item_id), (impl_get_item_type),
	(connect_item), (ephy_toolbars_model_set_bookmarks),
	(ephy_toolbars_model_class_init), (save_changes), (item_added),
	(item_removed), (toolbar_added), (toolbar_removed),
	(ephy_toolbars_model_init), (ephy_toolbars_model_finalize),
	(ephy_toolbars_model_remove_bookmark),

4 files changed, 66 insertions, 160 deletions

diff --git a/lib/widgets/ephy-node-view.c b/lib/widgets/ephy-node-view.c
index 86eb48f49..0a83d0744 100644
--- a/lib/widgets/ephy-node-view.c
+++ b/lib/widgets/ephy-node-view.c
@@ -24,6 +24,7 @@
 #include <gtk/gtkcellrendererpixbuf.h>
 #include <gtk/gtkwindow.h>
 #include <gdk/gdkkeysyms.h>
+#include <libgnomevfs/gnome-vfs-uri.h>
 
 #include "eggtreemodelfilter.h"
 #include "ephy-node-view.h"
@@ -306,18 +307,15 @@ drag_data_received_cb (GtkWidget *widget,
 					       x, y, &path, &pos))
 	{
 		EphyNode *node;
-		GList *src_nodes;
+		GList *uris;
 
 		node = get_node_from_path (view, path);
 
-		src_nodes = ephy_dnd_node_list_extract_nodes
-				(selection_data->data);
-
+		uris = gnome_vfs_uri_list_parse (selection_data->data);
 		g_signal_emit (G_OBJECT (view),
 			       ephy_node_view_signals[NODE_DROPPED], 0,
-			       node, src_nodes);
-
-		g_list_free (src_nodes);
+			       node, uris);
+		gnome_vfs_uri_list_free (uris);
 
 		gtk_tree_path_free (path);
 	}
@@ -426,7 +424,7 @@ ephy_node_view_select_node_by_key (EphyNodeView *view, GdkEventKey *event)
 	gboolean found = FALSE;
 	gchar outbuf[6];
 	gint length;
-	
+
 	length = g_unichar_to_utf8 (gdk_keyval_to_unicode (event->keyval), outbuf);
 	event_string = g_utf8_casefold (outbuf, length);
 
@@ -456,7 +454,7 @@ ephy_node_view_select_node_by_key (EphyNodeView *view, GdkEventKey *event)
 	{
 		iter = last_iter;
 	}
-	
+
 	path = gtk_tree_model_get_path (view->priv->sortmodel, &iter);
 	gtk_tree_view_set_cursor (GTK_TREE_VIEW (view), path, NULL, FALSE);
 	gtk_tree_path_free (path);
@@ -573,22 +571,6 @@ ephy_node_view_get_property (GObject *object,
 }
 
 static void
-node_from_sort_iter_cb (EphyTreeModelSort *model,
-		        GtkTreeIter *iter,
-		        void **node,
-		        EphyNodeView *view)
-{
-	GtkTreeIter filter_iter, node_iter;
-
-	gtk_tree_model_sort_convert_iter_to_child_iter (GTK_TREE_MODEL_SORT (model),
-							&filter_iter, iter);
-	egg_tree_model_filter_convert_iter_to_child_iter (EGG_TREE_MODEL_FILTER (view->priv->filtermodel),
-							  &node_iter, &filter_iter);
-	*node = ephy_tree_model_node_node_from_iter
-		(EPHY_TREE_MODEL_NODE (view->priv->nodemodel), &node_iter);
-}
-
-static void
 ephy_node_view_construct (EphyNodeView *view)
 {
 	GtkTreeSelection *selection;
@@ -600,11 +582,6 @@ ephy_node_view_construct (EphyNodeView *view)
 	egg_tree_model_filter_set_visible_column (EGG_TREE_MODEL_FILTER (view->priv->filtermodel),
 						  EPHY_TREE_MODEL_NODE_COL_VISIBLE);
 	view->priv->sortmodel = ephy_tree_model_sort_new (view->priv->filtermodel);
-	g_signal_connect_object (G_OBJECT (view->priv->sortmodel),
-				 "node_from_iter",
-				 G_CALLBACK (node_from_sort_iter_cb),
-				 view,
-				 0);
 	gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (view->priv->sortmodel));
 	g_signal_connect_object (G_OBJECT (view),
 			         "button_press_event",
@@ -779,6 +756,29 @@ provide_text_weight (EphyNode *node, GValue *value, EphyNodeView *view)
 	}
 }
 
+int
+ephy_node_view_add_data_column (EphyNodeView *view,
+			        GType value_type,
+				int prop_id,
+			        EphyTreeModelNodeValueFunc func,
+				gpointer data)
+{
+	int column;
+
+	if (func)
+	{
+		column = ephy_tree_model_node_add_func_column
+			(view->priv->nodemodel, value_type, func, data);
+	}
+	else
+	{
+		column = ephy_tree_model_node_add_prop_column
+			(view->priv->nodemodel, value_type, prop_id);
+	}
+
+	return column;
+}
+
 GtkTreeViewColumn *
 ephy_node_view_add_column (EphyNodeView *view,
 			   const char  *title,
@@ -1040,7 +1040,7 @@ void
 ephy_node_view_enable_drag_source (EphyNodeView *view,
 				   GtkTargetEntry *types,
 				   int n_types,
-				   guint prop_id)
+				   int column)
 {
 	GtkWidget *treeview;
 
@@ -1055,8 +1055,8 @@ ephy_node_view_enable_drag_source (EphyNodeView *view,
 						types, n_types,
 						GDK_ACTION_COPY);
 
-	ephy_tree_model_sort_set_drag_property (EPHY_TREE_MODEL_SORT (view->priv->sortmodel),
-						prop_id);
+	ephy_tree_model_sort_set_column_id (EPHY_TREE_MODEL_SORT (view->priv->sortmodel),
+					    column);
 }
 
 void
diff --git a/lib/widgets/ephy-node-view.h b/lib/widgets/ephy-node-view.h
index 1ccc6cda4..55fab714a 100644
--- a/lib/widgets/ephy-node-view.h
+++ b/lib/widgets/ephy-node-view.h
@@ -85,6 +85,12 @@ GtkTreeViewColumn *ephy_node_view_add_column	      (EphyNodeView *view,
 						       EphyNodeViewFlags flags,
 						       EphyTreeModelNodeValueFunc icon_func);
 
+int		   ephy_node_view_add_data_column     (EphyNodeView *view,
+			                               GType value_type,
+						       int prop_id,
+			                               EphyTreeModelNodeValueFunc func,
+						       gpointer data);
+
 void		   ephy_node_view_remove              (EphyNodeView *view);
 
 gboolean           ephy_node_view_has_selection       (EphyNodeView *view,
@@ -98,7 +104,7 @@ void	           ephy_node_view_select_node         (EphyNodeView *view,
 void	           ephy_node_view_enable_drag_source  (EphyNodeView *view,
 						       GtkTargetEntry *types,
 						       int n_types,
-						       guint prop_id);
+						       int column_id);
 
 void	           ephy_node_view_enable_drag_dest    (EphyNodeView *view,
 						       GtkTargetEntry *types,
diff --git a/lib/widgets/ephy-tree-model-sort.c b/lib/widgets/ephy-tree-model-sort.c
index d3b425325..14096989b 100644
--- a/lib/widgets/ephy-tree-model-sort.c
+++ b/lib/widgets/ephy-tree-model-sort.c
@@ -44,19 +44,11 @@ static gboolean ephy_tree_model_sort_multi_drag_data_delete (EggTreeMultiDragSou
 struct EphyTreeModelSortPrivate
 {
 	char *str_list;
-	guint drag_property_id;
-};
-
-enum
-{
-	NODE_FROM_ITER,
-	LAST_SIGNAL
+	int drag_column_id;
 };
 
 static GObjectClass *parent_class = NULL;
 
-static guint ephy_tree_model_sort_signals[LAST_SIGNAL] = { 0 };
-
 GType
 ephy_tree_model_sort_get_type (void)
 {
@@ -103,18 +95,6 @@ ephy_tree_model_sort_class_init (EphyTreeModelSortClass *klass)
 	parent_class = g_type_class_peek_parent (klass);
 
 	object_class->finalize = ephy_tree_model_sort_finalize;
-
-	ephy_tree_model_sort_signals[NODE_FROM_ITER] =
-		g_signal_new ("node_from_iter",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (EphyTreeModelSortClass, node_from_iter),
-			      NULL, NULL,
-			      ephy_marshal_VOID__POINTER_POINTER,
-			      G_TYPE_NONE,
-			      2,
-			      G_TYPE_POINTER,
-			      G_TYPE_POINTER);
 }
 
 static void
@@ -122,7 +102,7 @@ ephy_tree_model_sort_init (EphyTreeModelSort *ma)
 {
 	ma->priv = g_new0 (EphyTreeModelSortPrivate, 1);
 
-	ma->priv->drag_property_id = -1;
+	ma->priv->drag_column_id = -1;
 }
 
 static void
@@ -166,36 +146,14 @@ ephy_tree_model_sort_multi_drag_source_init (EggTreeMultiDragSourceIface *iface)
 static gboolean
 ephy_tree_model_sort_multi_row_draggable (EggTreeMultiDragSource *drag_source, GList *path_list)
 {
-	GList *l;
-
-	for (l = path_list; l != NULL; l = g_list_next (l))
-	{
-		GtkTreeIter iter;
-		GtkTreePath *path;
-		EphyNode *node = NULL;
-
-		path = gtk_tree_row_reference_get_path (l->data);
-		gtk_tree_model_get_iter (GTK_TREE_MODEL (drag_source), &iter, path);
-		g_signal_emit (G_OBJECT (drag_source),
-			       ephy_tree_model_sort_signals[NODE_FROM_ITER],
-			       0, &iter, &node);
-
-		gtk_tree_path_free (path);
-
-		if (node == NULL)
-		{
-			return FALSE;
-		}
-	}
-
-	return TRUE;
+	return (EPHY_TREE_MODEL_SORT (drag_source)->priv->drag_column_id > 0);
 }
 
 void
-ephy_tree_model_sort_set_drag_property (EphyTreeModelSort *ms,
-					guint id)
+ephy_tree_model_sort_set_column_id (EphyTreeModelSort *ms,
+				    int id)
 {
-	ms->priv->drag_property_id = id;
+	ms->priv->drag_column_id = id;
 }
 
 static gboolean
@@ -206,75 +164,36 @@ ephy_tree_model_sort_multi_drag_data_delete (EggTreeMultiDragSource *drag_source
 }
 
 static void
-each_url_get_data_binder (EphyDragEachSelectedItemDataGet iteratee,
-			  gpointer iterator_context, gpointer data)
+each_property_get_data_binder (EphyDragEachSelectedItemDataGet iteratee,
+			       gpointer iterator_context, gpointer data)
 {
 	gpointer *context = (gpointer *) iterator_context;
 	GList *path_list = (GList *) (context[0]);
 	GList *i;
-	GtkTreeModel *model = GTK_TREE_MODEL (context[1]);
+	EphyTreeModelSort *model = EPHY_TREE_MODEL_SORT (context[1]);
+	GValue value = {0, };
 
 	for (i = path_list; i != NULL; i = i->next)
 	{
 		GtkTreeIter iter;
 		GtkTreePath *path = NULL;
-		EphyNode *node = NULL;
-		const char *value;
+		const char *svalue;
 
 		path = gtk_tree_row_reference_get_path (i->data);
-
 		gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path);
-		g_signal_emit (G_OBJECT (model),
-			       ephy_tree_model_sort_signals[NODE_FROM_ITER],
-			       0, &iter, &node);
+		gtk_tree_model_get_value (GTK_TREE_MODEL (model), &iter,
+					  model->priv->drag_column_id,
+					  &value);
+		svalue = g_value_get_string (&value);
 
-		gtk_tree_path_free (path);
-
-		if (node == NULL)
-			return;
-
-		value = ephy_node_get_property_string
-			(node, EPHY_TREE_MODEL_SORT (model)->priv->drag_property_id);
-
-		LOG ("Data get %s", value)
-
-		iteratee (value, -1, -1, -1, -1, data);
-	}
-}
+		g_return_if_fail (svalue != NULL);
 
-static void
-each_node_get_data_binder (EphyDragEachSelectedItemDataGet iteratee,
-			   gpointer iterator_context, gpointer data)
-{
-	gpointer *context = (gpointer *) iterator_context;
-	GList *path_list = (GList *) (context[0]);
-	GList *i;
-	GtkTreeModel *model = GTK_TREE_MODEL (context[1]);
+		LOG ("Data get %s", svalue)
 
-	for (i = path_list; i != NULL; i = i->next)
-	{
-		GtkTreeIter iter;
-		GtkTreePath *path = NULL;
-		EphyNode *node = NULL;
-		EphyNodeDb *db;
-		char *value;
+		iteratee (svalue, -1, -1, -1, -1, data);
 
-		path = gtk_tree_row_reference_get_path (i->data);
-		gtk_tree_model_get_iter (GTK_TREE_MODEL (model), &iter, path);
-		g_signal_emit (G_OBJECT (model),
-			       ephy_tree_model_sort_signals[NODE_FROM_ITER],
-			       0, &iter, &node);
 		gtk_tree_path_free (path);
-
-		if (node == NULL)
-			return;
-
-		db = ephy_node_get_db (node);
-		value = g_strdup_printf ("%s;%ld",
-					 ephy_node_db_get_name (db),
-					 ephy_node_get_id (node));
-		iteratee (value, -1, -1, -1, -1, data);
-		g_free (value);
+		g_value_unset (&value);
 	}
 }
 
@@ -283,32 +202,13 @@ ephy_tree_model_sort_multi_drag_data_get (EggTreeMultiDragSource *drag_source,
 					  GList *path_list,
 					  GtkSelectionData *selection_data)
 {
-	GdkAtom target;
-
-	target = selection_data->target;
-
-	if (target == gdk_atom_intern (EPHY_DND_BOOKMARK_TYPE, FALSE) ||
-	    target == gdk_atom_intern (EPHY_DND_TOPIC_TYPE, FALSE))
-	{
-		gpointer icontext[2];
-
-		icontext[0] = path_list;
-		icontext[1] = drag_source;
+	gpointer icontext[2];
 
-		ephy_dnd_drag_data_get (NULL, NULL, selection_data,
-			0, &icontext, each_node_get_data_binder);
+	icontext[0] = path_list;
+	icontext[1] = drag_source;
 
-	}
-	else
-	{
-		gpointer icontext[2];
-
-		icontext[0] = path_list;
-		icontext[1] = drag_source;
-
-		ephy_dnd_drag_data_get (NULL, NULL, selection_data,
-			0, &icontext, each_url_get_data_binder);
-	}
+	ephy_dnd_drag_data_get (NULL, NULL, selection_data,
+				0, &icontext, each_property_get_data_binder);
 
 	return TRUE;
 }
diff --git a/lib/widgets/ephy-tree-model-sort.h b/lib/widgets/ephy-tree-model-sort.h
index 2b8b38be9..abe21ddbb 100644
--- a/lib/widgets/ephy-tree-model-sort.h
+++ b/lib/widgets/ephy-tree-model-sort.h
@@ -53,8 +53,8 @@ GType		ephy_tree_model_sort_get_type		(void);
 
 GtkTreeModel   *ephy_tree_model_sort_new		(GtkTreeModel *child_model);
 
-void		ephy_tree_model_sort_set_drag_property	(EphyTreeModelSort *ms,
-							 guint id);
+void		ephy_tree_model_sort_set_column_id	(EphyTreeModelSort *ms,
+							 int id);
 
 G_END_DECLS