diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2014-09-09 15:19:55 -0700 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2014-09-09 15:49:12 -0700 |
| commit | 6eddc3851b361c892fa2903016a1c5d2cd6baf2b (patch) | |
| tree | e008702aa88216ca61160b59b385fd64065e9d81 | |
| parent | 605b2e0fae5799084cbd5262f921bc2c60300211 (diff) | |
| download | nautilus-6eddc3851b361c892fa2903016a1c5d2cd6baf2b.tar.gz | |
file: move some code around
We'll need this in the next commit.
| -rw-r--r-- | libnautilus-private/nautilus-file.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c index a8ad853c0..149cc0874 100644 --- a/libnautilus-private/nautilus-file.c +++ b/libnautilus-private/nautilus-file.c @@ -4434,6 +4434,7 @@ nautilus_file_get_thumbnail_icon (NautilusFile *file, NautilusIconInfo *icon; icon = NULL; + pixbuf = NULL; if (flags & NAUTILUS_FILE_ICON_FLAGS_FORCE_THUMBNAIL_SIZE) { modified_size = size * scale; @@ -4497,8 +4498,6 @@ nautilus_file_get_thumbnail_icon (NautilusFile *file, DEBUG ("Returning thumbnailed image, at size %d %d", (int) (w * thumb_scale), (int) (h * thumb_scale)); - - icon = nautilus_icon_info_new_for_pixbuf (pixbuf, scale); } else if (file->details->thumbnail_path == NULL && file->details->can_read && !file->details->is_thumbnailing && @@ -4507,6 +4506,10 @@ nautilus_file_get_thumbnail_icon (NautilusFile *file, nautilus_create_thumbnail (file); } + if (pixbuf != NULL) { + icon = nautilus_icon_info_new_for_pixbuf (pixbuf, scale); + } + if (icon == NULL && file->details->is_thumbnailing) { gicon = g_themed_icon_new (ICON_NAME_THUMBNAIL_LOADING); icon = nautilus_icon_info_lookup (gicon, size, scale); |