From 9cae696fab61f42ab16d38bf7c95c5605b924a0d Mon Sep 17 00:00:00 2001 From: Sanjeev BA Date: Thu, 31 Jul 2014 10:47:09 +0900 Subject: [PATCH] Do not load non-image files in ephoto. Fix for https://phab.enlightenment.org/T802 Summary: ephoto uses evas_common_extension_can_load_get() to determine whether a certain type of file should be displayed or not. mp3, mp4, ogg etc can be loaded by evas. There is already code in ephoto to enable "mime" type based loading of files - commented because efreet crashed in multi thread case. We should enable that code and fix issues in efreet. Reviewers: raster Differential Revision: https://phab.enlightenment.org/D1257 --- src/bin/ephoto.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h index 04e5530..f4e8513 100644 --- a/src/bin/ephoto.h +++ b/src/bin/ephoto.h @@ -163,17 +163,17 @@ extern int __log_domain; static inline Eina_Bool _ephoto_eina_file_direct_info_image_useful(const Eina_File_Direct_Info *info) { - const char /* *type, */ *bname; + const char *type, *bname; bname = info->path + info->name_start; if (bname[0] == '.') return EINA_FALSE; if ((info->type != EINA_FILE_REG) && (info->type != EINA_FILE_UNKNOWN)) return EINA_FALSE; - return evas_object_image_extension_can_load_get(bname); + //return evas_object_image_extension_can_load_get(bname); /* seems that this does not play nice with threads */ - //if (!(type = efreet_mime_type_get(info->path))) return EINA_FALSE; - //return strncmp(type, "image/", sizeof("image/") - 1) == 0; + if (!(type = efreet_mime_type_get(info->path))) return EINA_FALSE; + return strncmp(type, "image/", sizeof("image/") - 1) == 0; } extern int EPHOTO_EVENT_ENTRY_CREATE;