diff options
| author | Pavel Cisler <pavel@eazel.com> | 2001-02-07 08:17:09 +0000 |
|---|---|---|
| committer | Pavel Cisler <pce@src.gnome.org> | 2001-02-07 08:17:09 +0000 |
| commit | 1d87a73e66e20e2dc41302cd9760374040e4a819 (patch) | |
| tree | 6e4c02214105ca87e015a06cc187213f079647f9 | |
| parent | a37f637893263dcbf4b08827e2b34d5ba433efba (diff) | |
| download | nautilus-1d87a73e66e20e2dc41302cd9760374040e4a819.tar.gz | |
reviewed by: Mike Fleming <mfleming@eazel.com>
2001-02-06 Pavel Cisler <pavel@eazel.com>
reviewed by: Mike Fleming <mfleming@eazel.com>
* libnautilus-extensions/nautilus-directory-async.c:
(dequeue_pending_idle_callback), (mime_list_one):
Handle the case where mime types don't get returned.
* libnautilus-extensions/nautilus-file.c:
Fix a comment.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-directory-async.c | 7 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-file.c | 2 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-directory-async.c | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-file.c | 2 |
5 files changed, 23 insertions, 6 deletions
@@ -1,3 +1,14 @@ +2001-02-06 Pavel Cisler <pavel@eazel.com> + + reviewed by: Mike Fleming <mfleming@eazel.com> + + * libnautilus-extensions/nautilus-directory-async.c: + (dequeue_pending_idle_callback), (mime_list_one): + Handle the case where mime types don't get returned. + + * libnautilus-extensions/nautilus-file.c: + Fix a comment. + 2001-02-06 Andy Hertzfeld <andy@eazel.com> * libnautilus-extensions/nautilus-mime-actions.c: diff --git a/libnautilus-extensions/nautilus-directory-async.c b/libnautilus-extensions/nautilus-directory-async.c index ebb16e7fb..695e1ecf3 100644 --- a/libnautilus-extensions/nautilus-directory-async.c +++ b/libnautilus-extensions/nautilus-directory-async.c @@ -1246,7 +1246,8 @@ dequeue_pending_idle_callback (gpointer callback_data) } /* Add the MIME type to the set. */ - if (directory->details->load_mime_list_hash != NULL) { + if ((file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0 + && directory->details->load_mime_list_hash != NULL) { istr_set_insert (directory->details->load_mime_list_hash, file_info->mime_type); } @@ -2612,7 +2613,9 @@ static void mime_list_one (NautilusDirectory *directory, GnomeVFSFileInfo *info) { - istr_set_insert (directory->details->mime_list_hash, info->mime_type); + if ((info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0) { + istr_set_insert (directory->details->mime_list_hash, info->mime_type); + } } static void diff --git a/libnautilus-extensions/nautilus-file.c b/libnautilus-extensions/nautilus-file.c index 255e12c21..6924cf782 100644 --- a/libnautilus-extensions/nautilus-file.c +++ b/libnautilus-extensions/nautilus-file.c @@ -3685,7 +3685,7 @@ nautilus_file_get_string_attribute_with_default (NautilusFile *file, const char } /** - * nautilus_file_get_type_as_string: + * get_description: * * Get a user-displayable string representing a file type. The caller * is responsible for g_free-ing this string. diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index ebb16e7fb..695e1ecf3 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -1246,7 +1246,8 @@ dequeue_pending_idle_callback (gpointer callback_data) } /* Add the MIME type to the set. */ - if (directory->details->load_mime_list_hash != NULL) { + if ((file_info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0 + && directory->details->load_mime_list_hash != NULL) { istr_set_insert (directory->details->load_mime_list_hash, file_info->mime_type); } @@ -2612,7 +2613,9 @@ static void mime_list_one (NautilusDirectory *directory, GnomeVFSFileInfo *info) { - istr_set_insert (directory->details->mime_list_hash, info->mime_type); + if ((info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE) != 0) { + istr_set_insert (directory->details->mime_list_hash, info->mime_type); + } } static void diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index 255e12c21..6924cf782 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -3685,7 +3685,7 @@ nautilus_file_get_string_attribute_with_default (NautilusFile *file, const char } /** - * nautilus_file_get_type_as_string: + * get_description: * * Get a user-displayable string representing a file type. The caller * is responsible for g_free-ing this string. |