nautilus r14550 - in trunk: . src/file-manager



Author: cneumair
Date: Sun Aug 31 22:52:27 2008
New Revision: 14550
URL: http://svn.gnome.org/viewvc/nautilus?rev=14550&view=rev

Log:
2008-09-01  Christian Neumair  <cneumair gnome org>

	* src/file-manager/fm-directory-view.c (done_loading):
	Only report that loading is complete and schedule selection 
	if all files are seen. Fixes #421759.


Modified:
   trunk/ChangeLog
   trunk/src/file-manager/fm-directory-view.c

Modified: trunk/src/file-manager/fm-directory-view.c
==============================================================================
--- trunk/src/file-manager/fm-directory-view.c	(original)
+++ trunk/src/file-manager/fm-directory-view.c	Sun Aug 31 22:52:27 2008
@@ -2356,18 +2356,20 @@
 	 * is no NautilusWindowInfo any more.
 	 */
 	if (view->details->window != NULL) {
-		nautilus_window_info_report_load_complete (view->details->window, NAUTILUS_VIEW (view));
+		if (all_files_seen) {
+			nautilus_window_info_report_load_complete (view->details->window, NAUTILUS_VIEW (view));
+		}
+
 		schedule_update_menus (view);
 		schedule_update_status (view);
 		check_for_directory_hard_limit (view);
 		reset_update_interval (view);
 
 		locations_selected = view->details->pending_locations_selected;
-		if (locations_selected != NULL) {
+		if (locations_selected != NULL && all_files_seen) {
 			view->details->pending_locations_selected = NULL;
 			
 			selection = file_list_from_location_list (locations_selected);
-			eel_g_object_list_free (locations_selected);
 
 			view->details->selection_change_is_due_to_shell = TRUE;
 			fm_directory_view_set_selection (view, selection);
@@ -2391,6 +2393,7 @@
 				fm_directory_view_reveal_selection (view);
 			}
 		}
+		eel_g_object_list_free (locations_selected);
 		fm_directory_view_display_selection_info (view);
 	}
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]