nautilus r14097 - in branches/gnome-2-20: . libnautilus-private

[cneumair svn gnome org]

Author: cneumair
Date: Sun Apr 27 16:51:50 2008
New Revision: 14097
URL: http://svn.gnome.org/viewvc/nautilus?rev=14097&view=rev

Log:
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.


Modified:
   branches/gnome-2-20/ChangeLog
   branches/gnome-2-20/libnautilus-private/nautilus-directory-async.c

Modified: branches/gnome-2-20/libnautilus-private/nautilus-directory-async.c
==============================================================================
--- branches/gnome-2-20/libnautilus-private/nautilus-directory-async.c	(original)
+++ branches/gnome-2-20/libnautilus-private/nautilus-directory-async.c	Sun Apr 27 16:51:50 2008
@@ -844,7 +844,8 @@
 
 			/* 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 @@
 		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);
 	}
 }