diff options
author | Martin Wehner <martin.wehner@gmail.com> | 2005-06-20 07:43:48 +0000 |
---|---|---|
committer | Martin Wehner <mwehner@src.gnome.org> | 2005-06-20 07:43:48 +0000 |
commit | 2fdbb10670fb606a27470af90c35ca5fa3147a1d (patch) | |
tree | 67bb433017a6634ba566d3c83901a5c89de190b1 | |
parent | e43dc6c2f01c1aff25acb433c2ba145a26627513 (diff) | |
download | nautilus-2fdbb10670fb606a27470af90c35ca5fa3147a1d.tar.gz |
Make mime sniffing a high priority job. Prevents activation from getting
2005-06-20 Martin Wehner <martin.wehner@gmail.com>
* 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)
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | libnautilus-private/nautilus-directory-async.c | 9 |
2 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,11 @@ +2005-06-20 Martin Wehner <martin.wehner@gmail.com> + + * 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 <martin.wehner@gmail.com> * 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; } |