Don't add files to the work queue of a directory they don't belong to.

2002-08-09  Dave Camp  <dave@ximian.com>

	* libnautilus-private/nautilus-directory.c
	(call_files_changed_common): Don't add files to the work queue of
	a directory they don't belong to.

	* libnautilus-private/nautilus-directory-async.c
	(mime_list_start): Replaced got_directory_count with
	got_mime_list.
	(nautilus_directory_add_file_to_work_queue): Added a
	g_return_if_fail (file->details->directory == directory)
This commit is contained in:
Dave Camp 2002-08-09 19:38:37 +00:00 committed by Dave Camp
parent 0eed75c85d
commit 07cc9c27cd
3 changed files with 21 additions and 2 deletions

View file

@ -1,3 +1,15 @@
2002-08-09 Dave Camp <dave@ximian.com>
* libnautilus-private/nautilus-directory.c
(call_files_changed_common): Don't add files to the work queue of
a directory they don't belong to.
* libnautilus-private/nautilus-directory-async.c
(mime_list_start): Replaced got_directory_count with
got_mime_list.
(nautilus_directory_add_file_to_work_queue): Added a
g_return_if_fail (file->details->directory == directory)
2002-08-08 Federico Mena Quintero <federico@ximian.com>
* icons/crux_teal/crux_teal.xml: Added the "highlight_color_rgba"

View file

@ -2478,7 +2478,7 @@ mime_list_start (NautilusDirectory *directory,
if (!nautilus_file_is_directory (file)) {
g_list_free (file->details->mime_list);
file->details->mime_list_failed = FALSE;
file->details->got_directory_count = FALSE;
file->details->got_mime_list = FALSE;
file->details->mime_list_is_up_to_date = TRUE;
nautilus_directory_async_state_changed (directory);
@ -3265,6 +3265,8 @@ void
nautilus_directory_add_file_to_work_queue (NautilusDirectory *directory,
NautilusFile *file)
{
g_return_if_fail (file->details->directory == directory);
if (!file_needs_work_done (directory, file)) {
return;
}

View file

@ -843,9 +843,14 @@ static void
call_files_changed_common (NautilusDirectory *directory, GList *file_list)
{
GList *node;
NautilusFile *file;
for (node = file_list; node != NULL; node = node->next) {
nautilus_directory_add_file_to_work_queue (directory, node->data);
file = node->data;
if (file->details->directory == directory) {
nautilus_directory_add_file_to_work_queue (directory,
file);
}
}
nautilus_directory_async_state_changed (directory);
nautilus_directory_emit_change_signals (directory, file_list);