diff options
| author | Christian Neumair <cneumair@gnome.org> | 2008-04-27 16:51:50 +0000 |
|---|---|---|
| committer | Christian Neumair <cneumair@src.gnome.org> | 2008-04-27 16:51:50 +0000 |
| commit | a6c9ca4988070fa0376653ede56a138249507fc5 (patch) | |
| tree | 2dba956b6b6240e1b9e88878a9604ee6806083a7 | |
| parent | ebf165fa248ff9854100db7cf85b918e15bc79af (diff) | |
| download | nautilus-a6c9ca4988070fa0376653ede56a138249507fc5.tar.gz | |
Do not insert NULL MIME types into MIME type hash table. Fixes #522534.
2008-04-27 Christian Neumair <cneumair@gnome.org>
* libnautilus-private/nautilus-directory-async.c
(dequeue_pending_idle_callback), (mime_list_one):
Do not insert NULL MIME types into MIME type hash table. Fixes #522534.
Thanks to Paweł Paprota.
svn path=/branches/gnome-2-20/; revision=14097
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-directory-async.c | 6 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2008-04-27 Christian Neumair <cneumair@gnome.org> + + * libnautilus-private/nautilus-directory-async.c + (dequeue_pending_idle_callback), (mime_list_one): + Do not insert NULL MIME types into MIME type hash table. Fixes #522534. + Thanks to Paweł Paprota. + 2008-01-28 Colin Walters <walters@redhat.com> * src/nautilus-location-entry.c: Remove unused variables so we build diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index 49757cf59..2f6d5beef 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -844,7 +844,8 @@ dequeue_pending_idle_callback (gpointer callback_data) /* Add the MIME type to the set. */ if ((file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0 - && directory->details->load_mime_list_hash != NULL) { + && directory->details->load_mime_list_hash != NULL + && file_info->mime_type != NULL) { istr_set_insert (directory->details->load_mime_list_hash, file_info->mime_type); } @@ -2522,7 +2523,8 @@ mime_list_one (NautilusDirectory *directory, return; } - if ((info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0) { + if ((info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0 && + info->mime_type != NULL) { istr_set_insert (directory->details->mime_list_hash, info->mime_type); } } |