1 files changed, 8 insertions, 0 deletions
diff --git a/libcaja-private/caja-icon-info.c b/libcaja-private/caja-icon-info.c
index 63ed8792..4d9b4aae 100644
--- a/libcaja-private/caja-icon-info.c
+++ b/libcaja-private/caja-icon-info.c
@@ -422,6 +422,14 @@ caja_icon_info_lookup (GIcon *icon,
 
 filename = gtk_icon_info_get_filename (gtkicon_info);
 
+ /* 96_no-null-in-g-str-hash.patch from ubuntu natty nautilus
+ https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/718098 */
+ if (filename == NULL) {
+ gtk_icon_info_free (gtkicon_info);
+ return caja_icon_info_new_for_pixbuf (NULL);
+ }
+ /* patch end */
+
 lookup_key.filename = (char *)filename;
 lookup_key.size = size;