Commit 449b58b2 authored by Alexander Larsson's avatar Alexander Larsson Committed by Alexander Larsson

We need to set "loading" as soon as we get the load_directory call,

2004-10-14  Alexander Larsson  <alexl@redhat.com>

	* src/file-manager/fm-directory-view.c: (load_directory),
	(finish_loading):
	We need to set "loading" as soon as we get the load_directory
	call, otherwise we don't correctly handle the selection being
	set.

	* src/file-manager/fm-icon-view.c: (fm_icon_view_begin_loading),
	(fm_icon_view_end_loading):
	No need for this to touch loading.

	Patch from Jimmy Do <crispyleaves@gmail.com>
parent 76085387
2004-10-14 Alexander Larsson <alexl@redhat.com>
* src/file-manager/fm-directory-view.c: (load_directory),
(finish_loading):
We need to set "loading" as soon as we get the load_directory
call, otherwise we don't correctly handle the selection being
set.
* src/file-manager/fm-icon-view.c: (fm_icon_view_begin_loading),
(fm_icon_view_end_loading):
No need for this to touch loading.
Patch from Jimmy Do <crispyleaves@gmail.com>
2004-10-13 Alexander Larsson <alexl@redhat.com>
* src/nautilus-navigation-window-ui.xml:
......
......@@ -251,6 +251,11 @@ struct FMDirectoryViewDetails
GList *pending_uris_selected;
/* loading indicates whether this view has begun loading a directory.
* This flag should need not be set inside subclasses. FMDirectoryView automatically
* sets 'loading' to TRUE before it begins loading a directory's contents and to FALSE
* after it finishes loading the directory and its view.
*/
gboolean loading;
gboolean menus_merged;
gboolean menu_states_untrustworthy;
......@@ -6803,6 +6808,8 @@ load_directory (FMDirectoryView *view,
fm_directory_view_stop (view);
fm_directory_view_clear (view);
view->details->loading = TRUE;
/* Update menus when directory is empty, before going to new
* location, so they won't have any false lingering knowledge
* of old selection.
......@@ -6869,8 +6876,6 @@ finish_loading (FMDirectoryView *view)
schedule_idle_display_of_pending_files (view);
}
view->details->loading = TRUE;
/* Start loading. */
/* Connect handlers to learn about loading progress. */
......
......@@ -1097,8 +1097,6 @@ fm_icon_view_begin_loading (FMDirectoryView *view)
file = fm_directory_view_get_directory_as_file (view);
icon_container = GTK_WIDGET (get_icon_container (icon_view));
icon_view->details->loading = TRUE;
/* kill any sound preview process that is ongoing */
preview_audio (icon_view, NULL, FALSE);
......@@ -1167,8 +1165,6 @@ fm_icon_view_end_loading (FMDirectoryView *view)
FMIconView *icon_view;
icon_view = FM_ICON_VIEW (view);
icon_view->details->loading = FALSE;
}
static void
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment