From 637b3475d9c8b5ff7c4dbf863c9c6b5953a6150b Mon Sep 17 00:00:00 2001 From: Stefano Karapetsas Date: Thu, 5 Jan 2012 00:07:26 +0100 Subject: applied 96_no-null-in-g-str-hash.patch from ubuntu natty nautilus --- libcaja-private/caja-icon-info.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'libcaja-private/caja-icon-info.c') 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; -- cgit v1.2.1