Finished up a loose end from when I made the change to

	* src/nautilus-window-private.h:
	* src/nautilus-window-manage-views.c: (free_location_change),
	(begin_location_change):
	Finished up a loose end from when I made the change to
	determine_initial_view to not get full attributes. This leftover
	code was causing an extra directory load.

	* THANKS: Added Yoann.

4 files changed, 12 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index de617314a..45a2b041e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-05-16  Darin Adler  <darin@eazel.com>
+
+	* src/nautilus-window-private.h:
+	* src/nautilus-window-manage-views.c: (free_location_change),
+	(begin_location_change):
+	Finished up a loose end from when I made the change to
+	determine_initial_view to not get full attributes. This leftover
+	code was causing an extra directory load.
+
+	* THANKS: Added Yoann.
+	
 2001-05-15  Andy Hertzfeld  <andy@eazel.com>
 
 	* src/nautilus-sidebar.c: (notify_current_sidebar_view),
diff --git a/THANKS b/THANKS
index 9c59e9778..8917f8325 100644
--- a/THANKS
+++ b/THANKS
@@ -35,6 +35,7 @@ Shane Butlers  <sbutle@deakin.edu.au> - IDE in hardware view patch for showing I
 Stanislav Brabec  <utx@penguin.cz> - bug fixes
 Vera Horiuchi  <vera@eazel.com> - documentation
 Victor Lecha  <victor@eazel.com> - build fixes
+Yoann Vandoorselaere  <yoann@mandrakesoft.com> - performance work
 
 The following people who did testing work:
 
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index ecc3864ad..d14b05019 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -1055,11 +1055,6 @@ free_location_change (NautilusWindow *window)
         g_free (window->details->pending_location);
         window->details->pending_location = NULL;
 
-        /* Important to do this first, because destroying the
-         * pending_location_as_directory can cause additional I/O to
-         * complete, which might cause the initial view callback to be
-         * called.
-         */
         if (window->details->determine_view_handle != NULL) {
                 nautilus_determine_initial_view_cancel (window->details->determine_view_handle);
                 window->details->determine_view_handle = NULL;
@@ -1073,13 +1068,6 @@ free_location_change (NautilusWindow *window)
         	gtk_object_unref (GTK_OBJECT (window->new_content_view));
                 window->new_content_view = NULL;
         }
-        
-        if (window->details->pending_location_as_directory != NULL) {
-                nautilus_directory_file_monitor_remove (window->details->pending_location_as_directory,
-                                                        window);
-                nautilus_directory_unref (window->details->pending_location_as_directory);
-                window->details->pending_location_as_directory = NULL;
-        }
 }
 
 static void
@@ -1393,17 +1381,6 @@ begin_location_change (NautilusWindow *window,
         nautilus_file_invalidate_all_attributes (file);
         nautilus_file_unref (file);
 
-        /* We start monitoring files here so we get a single load of
-         * the directory instead of multiple ones. The concept is that
-         * our load of the directory is shared both with the possible
-         * call_when_ready done by the nautilus_determine_initial_view
-         * call and loads done by components (like the icon view).
-         */
-        window->details->pending_location_as_directory = directory;
-        nautilus_directory_file_monitor_add
-                (window->details->pending_location_as_directory, window,
-                 TRUE, TRUE, NULL);
-
         window->details->determine_view_handle = nautilus_determine_initial_view
                 (location,
                  determined_initial_view_callback,
diff --git a/src/nautilus-window-private.h b/src/nautilus-window-private.h
index 3e6962a14..fd0ec973f 100644
--- a/src/nautilus-window-private.h
+++ b/src/nautilus-window-private.h
@@ -74,7 +74,6 @@ struct NautilusWindowDetails
         NautilusLocationChangeType location_change_type;
         guint location_change_distance;
         char *pending_location;
-        NautilusDirectory *pending_location_as_directory;
         GList *pending_selection;
         NautilusDetermineViewHandle *determine_view_handle;