Set pending_file_for_position before setting up the

2004-03-07  Gustavo Giráldez  <gustavo.giraldez@gmx.net>

	* src/nautilus-window-manage-views.c
	(determined_initial_view_callback): Set pending_file_for_position
	before setting up the position_and_show_window_callback callback
	for the file, to handle the case when the file gets ready before
	the callback setup returns (bug #136430).
This commit is contained in:
Gustavo Giráldez 2004-03-07 21:49:34 +00:00 committed by Gustavo Giráldez
parent 32caed0348
commit 0ec86d8e4b
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,11 @@
2004-03-07 Gustavo Giráldez <gustavo.giraldez@gmx.net>
* src/nautilus-window-manage-views.c
(determined_initial_view_callback): Set pending_file_for_position
before setting up the position_and_show_window_callback callback
for the file, to handle the case when the file gets ready before
the callback setup returns (bug #136430).
2004-03-05 Alexander Larsson <alexl@redhat.com>
* src/nautilus-application.c (volume_unmounted_callback):

View file

@ -1270,13 +1270,13 @@ determined_initial_view_callback (NautilusDetermineViewHandle *handle,
window->show_state = NAUTILUS_WINDOW_NOT_SHOWN;
if (!GTK_WIDGET_VISIBLE (window)) {
file = nautilus_file_get (location);
window->details->pending_file_for_position = file;
attributes = NAUTILUS_FILE_ATTRIBUTE_METADATA;
nautilus_file_call_when_ready (file,
attributes,
position_and_show_window_callback,
window);
window->details->pending_file_for_position = file;
}
load_content_view (window, initial_view);