diff options
| author | Stefano Karapetsas <[email protected]> | 2012-01-05 00:07:26 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2012-01-05 00:07:26 +0100 |
| commit | 637b3475d9c8b5ff7c4dbf863c9c6b5953a6150b (patch) | |
| tree | 245db700ca72bda718d6c338e5904ac130b21318 /libcaja-private | |
| parent | 4a58c31e2fad6731f31c314609dc9d7ec30066d9 (diff) | |
| download | caja-637b3475d9c8b5ff7c4dbf863c9c6b5953a6150b.tar.bz2 caja-637b3475d9c8b5ff7c4dbf863c9c6b5953a6150b.tar.xz | |
applied 96_no-null-in-g-str-hash.patch from ubuntu natty nautilus
Diffstat (limited to 'libcaja-private')
| -rw-r--r-- | libcaja-private/caja-icon-info.c | 8 |
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; |