From 4a0202b40d3938b2e4f12cb513d3bf76a03369f1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Mon, 6 Apr 2015 15:16:25 +0900 Subject: [PATCH] elm_image: Use Efl.File interface for mmap_set --- legacy/elementary/src/lib/elm_image.c | 19 ++++++++++++++++--- legacy/elementary/src/lib/elm_image.eo | 1 + 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/legacy/elementary/src/lib/elm_image.c b/legacy/elementary/src/lib/elm_image.c index 3b43405a5a..6f56799bb0 100644 --- a/legacy/elementary/src/lib/elm_image.c +++ b/legacy/elementary/src/lib/elm_image.c @@ -843,8 +843,9 @@ elm_image_file_set(Evas_Object *obj, ELM_IMAGE_CHECK(obj) EINA_FALSE; EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE); - eo_do(obj, ret = efl_file_set(file, group)); - eo_do(obj, elm_obj_image_sizing_eval()); + eo_do(obj, + ret = efl_file_set(file, group); + elm_obj_image_sizing_eval()); return ret; } @@ -862,10 +863,22 @@ elm_image_mmap_set(Evas_Object *obj, Eina_Bool ret = EINA_FALSE; ELM_IMAGE_CHECK(obj) EINA_FALSE; + EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE); + eo_do(obj, ret = efl_file_mmap_set(file, group)); + return ret; +} + +EOLIAN Eina_Bool +_elm_image_efl_file_mmap_set(Eo *obj, Elm_Image_Data *pd EINA_UNUSED, + const Eina_File *file, const char *key) +{ + Eina_Bool ret = EINA_FALSE; + EINA_SAFETY_ON_NULL_RETURN_VAL(file, EINA_FALSE); eo_do(obj, - ret = elm_obj_image_mmap_set(file, group), + ret = elm_obj_image_mmap_set(file, key), elm_obj_image_sizing_eval()); + return ret; } diff --git a/legacy/elementary/src/lib/elm_image.eo b/legacy/elementary/src/lib/elm_image.eo index 096d647b2b..58b5f6ecec 100644 --- a/legacy/elementary/src/lib/elm_image.eo +++ b/legacy/elementary/src/lib/elm_image.eo @@ -538,6 +538,7 @@ class Elm_Image (Elm_Widget, Efl.File, Efl.Image, Evas.Clickable_Interface, Eo.Base.constructor; Efl.File.file.set; Efl.File.file.get; + Efl.File.mmap.set; Efl.File.async.set; Efl.File.async.get; Efl.File.async_wait;