From 2fdbb10670fb606a27470af90c35ca5fa3147a1d Mon Sep 17 00:00:00 2001 From: Martin Wehner Date: Mon, 20 Jun 2005 07:43:48 +0000 Subject: Make mime sniffing a high priority job. Prevents activation from getting 2005-06-20 Martin Wehner * libnautilus-private/nautilus-directory-async.c: (start_or_stop_io), (file_needs_high_priority_work_done), (file_needs_low_priority_work_done): Make mime sniffing a high priority job. Prevents activation from getting blocked by deep count I/O. (#145560) --- ChangeLog | 8 ++++++++ libnautilus-private/nautilus-directory-async.c | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b302404e..c96221726 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-06-20 Martin Wehner + + * libnautilus-private/nautilus-directory-async.c: + (start_or_stop_io), (file_needs_high_priority_work_done), + (file_needs_low_priority_work_done): + Make mime sniffing a high priority job. Prevents activation + from getting blocked by deep count I/O. (#145560) + 2005-06-15 Martin Wehner * src/file-manager/fm-directory-view.c: (new_folder_done), diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index ea4080237..dbf43acb6 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -3345,7 +3345,6 @@ start_or_stop_io (NautilusDirectory *directory) if (file_needs_low_priority_work_done (directory, file)) { /* Start getting attributes if possible */ - file_info_start (directory, file); /* for slow mime type */ directory_count_start (directory, file); deep_count_start (directory, file); mime_list_start (directory, file); @@ -3574,6 +3573,10 @@ file_needs_high_priority_work_done (NautilusDirectory *directory, return TRUE; } + if (is_needy (file, lacks_slow_mime_type, wants_slow_mime_type)) { + return TRUE; + } + return FALSE; } @@ -3593,10 +3596,6 @@ file_needs_low_priority_work_done (NautilusDirectory *directory, return TRUE; } - if (is_needy (file, lacks_slow_mime_type, wants_slow_mime_type)) { - return TRUE; - } - if (is_needy (file, lacks_top_left, wants_top_left)) { return TRUE; } -- cgit v1.2.1