[nautilus] file: move some code around
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] file: move some code around
- Date: Tue, 9 Sep 2014 22:52:37 +0000 (UTC)
commit 6eddc3851b361c892fa2903016a1c5d2cd6baf2b
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Sep 9 15:19:55 2014 -0700
file: move some code around
We'll need this in the next commit.
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 a8ad853..149cc08 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]