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),

1 files changed, 5 insertions, 40 deletions

diff --git a/lib/ephy-dnd.c b/lib/ephy-dnd.c
index 4bf9cd2cd..a9e4b0c33 100644
--- a/lib/ephy-dnd.c
+++ b/lib/ephy-dnd.c
@@ -53,14 +53,14 @@ add_one_uri (const char *uri, int x, int y, int w, int h, gpointer data)
 }
 
 static void
-add_one_node (const char *uri, int x, int y, int w, int h, gpointer data)
+add_one_topic (const char *uri, int x, int y, int w, int h, gpointer data)
 {
         GString *result;
 
         result = (GString *) data;
 
         g_string_append (result, uri);
-        g_string_append (result, ";");
+        g_string_append (result, "\r\n");
 }
 
 gboolean
@@ -87,12 +87,11 @@ ephy_dnd_drag_data_get (GtkWidget *widget,
 		result = g_string_new (NULL);
                 (* each_selected_item_iterator) (add_one_netscape_url, container_context, result);
 	}
-	else if (target == gdk_atom_intern (EPHY_DND_TOPIC_TYPE, FALSE) ||
-	         target == gdk_atom_intern (EPHY_DND_BOOKMARK_TYPE, FALSE))
+	else if (target == gdk_atom_intern (EPHY_DND_TOPIC_TYPE, FALSE))
 	{
 		result = g_string_new (NULL);
-                (* each_selected_item_iterator) (add_one_node, container_context, result);
-		g_string_erase (result, result->len - 1, -1);
+                (* each_selected_item_iterator) (add_one_topic, container_context, result);
+		g_string_erase (result, result->len - 2, -1);
 	}
 	else
 	{
@@ -107,37 +106,3 @@ ephy_dnd_drag_data_get (GtkWidget *widget,
 
         return TRUE;
 }
-
-GList *
-ephy_dnd_node_list_extract_nodes (const char *node_list)
-{
-	GList *result = NULL;
-	char **nodes;
-	int i;
-
-	nodes = g_strsplit (node_list, ";", -1);
-
-	for (i = 0; nodes[i] != NULL && nodes[i+1] != NULL; i = i + 2)
-	{
-		gulong id;
-		EphyNodeDb *db;
-
-		db = ephy_node_db_get_by_name (nodes[i]);
-		g_return_val_if_fail (db != NULL, NULL);
-
-		if (ephy_string_to_int (nodes[i + 1], &id))
-		{
-			EphyNode *node;
-
-			node = ephy_node_db_get_node_from_id (db, id);
-			g_return_val_if_fail (node != NULL, NULL);
-			result = g_list_prepend (result, node);
-		}
-	}
-
-	result = g_list_reverse (result);
-
-	g_strfreev (nodes);
-
-	return result;
-}