[grilo/wip/hadess/simplify-pls-thumbnail] pls: Simplify thumbnail validity handling
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo/wip/hadess/simplify-pls-thumbnail] pls: Simplify thumbnail validity handling
- Date: Mon, 18 Feb 2019 16:03:06 +0000 (UTC)
commit d04445640a979a6ddfc38f710fcb57c7956fbd6e
Author: Bastien Nocera <hadess hadess net>
Date: Mon Feb 18 17:01:03 2019 +0100
pls: Simplify thumbnail validity handling
There's really no need to get both G_FILE_ATTRIBUTE_THUMBNAILING_FAILED
and G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID as they're generated from a
single variable in GIO.
libs/pls/grl-pls.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/libs/pls/grl-pls.c b/libs/pls/grl-pls.c
index ba7d849..62c578b 100644
--- a/libs/pls/grl-pls.c
+++ b/libs/pls/grl-pls.c
@@ -78,7 +78,6 @@ GRL_LOG_DOMAIN_STATIC(libpls_log_domain);
G_FILE_ATTRIBUTE_STANDARD_SIZE "," \
G_FILE_ATTRIBUTE_TIME_MODIFIED "," \
G_FILE_ATTRIBUTE_THUMBNAIL_PATH "," \
- G_FILE_ATTRIBUTE_THUMBNAILING_FAILED "," \
G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID
/* -------- Data structures ------- */
@@ -1217,7 +1216,7 @@ grl_pls_file_to_media (GrlMedia *content,
gchar *str;
gchar *extension;
const gchar *mime;
- gboolean thumb_failed, thumb_is_valid;
+ gboolean thumb_is_valid;
GError *error = NULL;
gboolean is_pls = FALSE;
@@ -1332,16 +1331,11 @@ grl_pls_file_to_media (GrlMedia *content,
g_date_time_unref (date_time);
/* Thumbnail */
- thumb_failed =
+ thumb_is_valid =
g_file_info_get_attribute_boolean (info,
- G_FILE_ATTRIBUTE_THUMBNAILING_FAILED);
- thumb_is_valid = TRUE;
- if (g_file_info_has_attribute (info, G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID))
- thumb_is_valid =
- g_file_info_get_attribute_boolean (info,
- G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID);
-
- if (!thumb_failed && thumb_is_valid) {
+ G_FILE_ATTRIBUTE_THUMBNAIL_IS_VALID);
+
+ if (thumb_is_valid) {
const gchar *thumb =
g_file_info_get_attribute_byte_string (info,
G_FILE_ATTRIBUTE_THUMBNAIL_PATH);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]