Port to GtkTreeView, lots of work still remains though.

2002-02-05  Anders Carlsson  <andersca@gnu.org>

	* components/tree/Makefile.am:
	* components/tree/nautilus-tree-model.c:
	(nautilus_tree_node_set_parent), (nautilus_tree_node_new),
	(nautilus_dummy_tree_node_new), (nautilus_tree_node_update_icons),
	(nautilus_tree_model_get_type), (nautilus_tree_model_init),
	(nautilus_tree_model_class_init), (uri_get_parent_text),
	(nautilus_tree_model_get_node_from_file),
	(nautilus_tree_model_get_node), (report_node_changed),
	(report_root_node_if_possible), (process_file_change),
	(nautilus_tree_model_directory_files_changed_callback),
	(nautilus_tree_model_directory_done_loading_callback),
	(nautilus_tree_model_begin_monitoring_directory),
	(nautilus_tree_model_get_n_columns),
	(nautilus_tree_model_get_column_type),
	(nautilus_tree_model_get_iter), (nautilus_tree_model_get_path),
	(nautilus_tree_model_get_value), (nautilus_tree_model_iter_next),
	(nautilus_tree_model_iter_children),
	(nautilus_tree_model_iter_parent),
	(nautilus_tree_model_iter_has_child),
	(nautilus_tree_model_iter_nth_child),
	(nautilus_tree_model_tree_model_init),
	(nautilus_tree_model_root_node_file_monitor),
	(nautilus_tree_model_set_root_uri), (nautilus_tree_model_new),
	(nautilus_tree_model_dump_helper), (nautilus_tree_model_dump):
	* components/tree/nautilus-tree-model.h:
	* components/tree/nautilus-tree-view.c: (create_tree),
	(tree_activate_callback), (dump_tree), (nautilus_tree_view_init),
	(nautilus_tree_view_class_init):
	* components/tree/nautilus-tree-view.h:
	Port to GtkTreeView, lots of work still remains though.

	* src/nautilus-application.c: (finish_startup):
	Remove GMC trash migration.

1 files changed, 1 insertions, 27 deletions

diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index e072b6f77..a09e13eba 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -277,31 +277,6 @@ nautilus_make_uri_list_from_shell_strv (const char * const *strv)
 	return uri_list;
 }
 
-/* Find ~/.gnome-desktop/Trash and rename it to ~/.gnome-desktop/Trash.gmc
- * Only if it is a directory
- */
-static void
-migrate_gmc_trash (void)
-{
-	char *dp, *trash_dir, *dest;
-	struct stat buf;
-
-	dp = nautilus_get_desktop_directory ();
-	trash_dir = g_strconcat (dp, "/", "Trash", NULL);
-	dest = g_strconcat (dp, "/", "Trash.gmc", NULL);
-	
-	if (stat (trash_dir, &buf) == 0 && S_ISDIR (buf.st_mode)) {
-		rename (trash_dir, dest);
-#if GNOME2_CONVERSION_COMPLETE
-		gnome_metadata_rename (trash_dir, dest);
-#endif
-	}
-	
-	g_free (dp);
-	g_free (trash_dir);
-	g_free (dest);
-}
-
 static void
 migrate_old_nautilus_files (void)
 {
@@ -395,8 +370,7 @@ finish_startup (NautilusApplication *application)
 	/* initialize URI authentication manager */
 	nautilus_authentication_manager_init ();
 
-	/* Make the desktop work with gmc and old Nautilus. */
-	migrate_gmc_trash ();
+	/* Make the desktop work with old Nautilus. */
 	migrate_old_nautilus_files ();
 }