Patch from: Juerg Billeter <j@bitron.ch>

2004-01-06  Alexander Larsson <alexl@redhat.com>

	Patch from: Juerg Billeter <j@bitron.ch>

	* components/Makefile.am:
	* components/tree/
	Remove tree component (moved to file-manager)

	* src/Nautilus_shell.server.in:
	* src/file-manager/Makefile.am:
	Move tree view here

	* src/nautilus-application.c:
	Tree view activation

	* src/file-manager/fm-properties-window.[ch]:
	* src/file-manager/fm-directory-view.c:
	Make properties window take GtkWidget instead of DirectoryView.

	* src/file-manager/fm-tree-model.[ch]:
	* src/file-manager/fm-tree-view.[ch]:
	Move tree view here, first cut at popup menus

1 files changed, 16 insertions, 16 deletions

diff --git a/src/file-manager/fm-properties-window.c b/src/file-manager/fm-properties-window.c
index b77b791f2..fb8efaf11 100644
--- a/src/file-manager/fm-properties-window.c
+++ b/src/file-manager/fm-properties-window.c
@@ -151,7 +151,7 @@ enum {
 typedef struct {
 	GList *original_files;
 	GList *target_files;
-	FMDirectoryView *directory_view;
+	GtkWidget *parent_widget;
 	char *pending_key;
 	GHashTable *pending_files;
 } StartupData;
@@ -192,7 +192,7 @@ static void is_directory_ready_callback (NautilusFile *file,
 					 gpointer data);
 static void cancel_group_change_callback          (gpointer                 callback_data);
 static void cancel_owner_change_callback          (gpointer                 callback_data);
-static void directory_view_destroyed_callback     (FMDirectoryView         *view,
+static void parent_widget_destroyed_callback      (GtkWidget                *widget,
 						   gpointer                 callback_data);
 static void select_image_button_callback          (GtkWidget               *widget,
 						   FMPropertiesWindow      *properties_window);
@@ -3305,7 +3305,7 @@ static StartupData *
 startup_data_new (GList *original_files, 
 		  GList *target_files,
 		  const char *pending_key,
-		  FMDirectoryView *directory_view)
+		  GtkWidget *parent_widget)
 {
 	StartupData *data;
 	GList *l;
@@ -3313,7 +3313,7 @@ startup_data_new (GList *original_files,
 	data = g_new0 (StartupData, 1);
 	data->original_files = nautilus_file_list_copy (original_files);
 	data->target_files = nautilus_file_list_copy (target_files);
-	data->directory_view = directory_view;
+	data->parent_widget = parent_widget;
 	data->pending_key = g_strdup (pending_key);
 	data->pending_files = g_hash_table_new (g_direct_hash,
 						g_direct_equal);
@@ -3369,7 +3369,7 @@ create_properties_window (StartupData *startup_data)
 	gtk_window_set_wmclass (GTK_WINDOW (window), "file_properties", "Nautilus");
 	gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 	gtk_window_set_screen (GTK_WINDOW (window),
-			       gtk_widget_get_screen (GTK_WIDGET (startup_data->directory_view)));
+			       gtk_widget_get_screen (startup_data->parent_widget));
 
 	/* Set initial window title */
 	update_properties_window_title (window);
@@ -3540,9 +3540,9 @@ cancel_create_properties_window_callback (gpointer callback_data)
 }
 
 static void
-directory_view_destroyed_callback (FMDirectoryView *view, gpointer callback_data)
+parent_widget_destroyed_callback (GtkWidget *widget, gpointer callback_data)
 {
-	g_assert (view == ((StartupData *)callback_data)->directory_view);
+	g_assert (widget == ((StartupData *)callback_data)->parent_widget);
 	
 	remove_pending ((StartupData *)callback_data, TRUE, TRUE, FALSE);
 }
@@ -3575,8 +3575,8 @@ remove_pending (StartupData *startup_data,
 			(cancel_create_properties_window_callback, startup_data);
 	}
 	if (cancel_destroy_handler) {
-		g_signal_handlers_disconnect_by_func (startup_data->directory_view,
-						      G_CALLBACK (directory_view_destroyed_callback),
+		g_signal_handlers_disconnect_by_func (startup_data->parent_widget,
+						      G_CALLBACK (parent_widget_destroyed_callback),
 						      startup_data);
 	}
 
@@ -3618,7 +3618,7 @@ is_directory_ready_callback (NautilusFile *file,
 
 void
 fm_properties_window_present (GList *original_files,
-			      FMDirectoryView *directory_view) 
+			      GtkWidget *parent_widget) 
 {
 	GList *l, *next;
 	GtkWidget *parent_window;
@@ -3628,7 +3628,7 @@ fm_properties_window_present (GList *original_files,
 	char *pending_key;
 
 	g_return_if_fail (original_files != NULL);
-	g_return_if_fail (FM_IS_DIRECTORY_VIEW (directory_view));
+	g_return_if_fail (GTK_IS_WIDGET (parent_widget));
 
 	/* Create the hash tables first time through. */
 	if (windows == NULL) {
@@ -3645,7 +3645,7 @@ fm_properties_window_present (GList *original_files,
 	existing_window = get_existing_window (original_files);
 	if (existing_window != NULL) {
 		gtk_window_set_screen (existing_window,
-				       gtk_widget_get_screen (GTK_WIDGET (directory_view)));
+				       gtk_widget_get_screen (parent_widget));
 		gtk_window_present (existing_window);
 		return;
 	}
@@ -3663,7 +3663,7 @@ fm_properties_window_present (GList *original_files,
 	startup_data = startup_data_new (original_files, 
 					 target_files,
 					 pending_key,
-					 directory_view);
+					 parent_widget);
 
 	nautilus_file_list_free (target_files);
 	g_free(pending_key);
@@ -3673,10 +3673,10 @@ fm_properties_window_present (GList *original_files,
 	 */
 	
 	g_hash_table_insert (pending_lists, startup_data->pending_key, startup_data->pending_key);
-	g_signal_connect (directory_view, "destroy",
-			  G_CALLBACK (directory_view_destroyed_callback), startup_data);
+	g_signal_connect (parent_widget, "destroy",
+			  G_CALLBACK (parent_widget_destroyed_callback), startup_data);
 
-	parent_window = gtk_widget_get_ancestor (GTK_WIDGET (directory_view), GTK_TYPE_WINDOW);
+	parent_window = gtk_widget_get_ancestor (parent_widget, GTK_TYPE_WINDOW);
 
 	eel_timed_wait_start
 		(cancel_create_properties_window_callback,