summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-05-31 20:44:41 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-05-31 20:51:31 +0900
commitb1e361e8de1f39c2d84e901bef189ebf4cfed66a (patch)
tree4d55038bdd0a5d3d09bbdf686e9c29b6a7184ac3
parenta0ec05cd8f9307d0a28f6902680f579b96812f71 (diff)
elm: Fix build (use efl_ui_image.eo)
-rw-r--r--src/lib/elementary/efl_ui_image.c6
-rw-r--r--src/lib/elementary/elm_image_eo.h2
-rw-r--r--src/lib/elementary/elm_image_legacy.h4
3 files changed, 7 insertions, 5 deletions
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index a2f43aa71e..3db96c9f5f 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -972,7 +972,7 @@ _efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *downloa
972 sd->remote = NULL; 972 sd->remote = NULL;
973 if (!ret) 973 if (!ret)
974 { 974 {
975 Elm_Image_Error err = { 0, EINA_TRUE }; 975 Efl_Ui_Image_Error err = { 0, EINA_TRUE };
976 976
977 free(sd->remote_data); 977 free(sd->remote_data);
978 sd->remote_data = NULL; 978 sd->remote_data = NULL;
@@ -997,7 +997,7 @@ _efl_ui_image_smart_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int er
997{ 997{
998 Eo *obj = data; 998 Eo *obj = data;
999 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS); 999 Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
1000 Elm_Image_Error err = { error, EINA_FALSE }; 1000 Efl_Ui_Image_Error err = { error, EINA_FALSE };
1001 1001
1002 eo_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err); 1002 eo_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
1003 1003
@@ -1009,7 +1009,7 @@ static void
1009_efl_ui_image_smart_download_progress(void *data, Elm_Url *url EINA_UNUSED, double now, double total) 1009_efl_ui_image_smart_download_progress(void *data, Elm_Url *url EINA_UNUSED, double now, double total)
1010{ 1010{
1011 Eo *obj = data; 1011 Eo *obj = data;
1012 Elm_Image_Progress progress; 1012 Efl_Ui_Image_Progress progress;
1013 1013
1014 progress.now = now; 1014 progress.now = now;
1015 progress.total = total; 1015 progress.total = total;
diff --git a/src/lib/elementary/elm_image_eo.h b/src/lib/elementary/elm_image_eo.h
index 22896e77bd..2c7feb8272 100644
--- a/src/lib/elementary/elm_image_eo.h
+++ b/src/lib/elementary/elm_image_eo.h
@@ -4,7 +4,7 @@
4 * @{ 4 * @{
5 */ 5 */
6 6
7#include "elm_image.eo.h" 7#include "efl_ui_image.eo.h"
8 8
9/** 9/**
10 * @} 10 * @}
diff --git a/src/lib/elementary/elm_image_legacy.h b/src/lib/elementary/elm_image_legacy.h
index 8bed5ca21d..ed9f6f2453 100644
--- a/src/lib/elementary/elm_image_legacy.h
+++ b/src/lib/elementary/elm_image_legacy.h
@@ -10,6 +10,8 @@
10 */ 10 */
11EAPI Evas_Object *elm_image_add(Evas_Object *parent); 11EAPI Evas_Object *elm_image_add(Evas_Object *parent);
12 12
13typedef Evas_Object Elm_Image;
14
13/** 15/**
14 * Set the file that will be used as the image's source. 16 * Set the file that will be used as the image's source.
15 * 17 *
@@ -629,4 +631,4 @@ EAPI void elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed);
629 */ 631 */
630EAPI Eina_Bool elm_image_aspect_fixed_get(const Evas_Object *obj); 632EAPI Eina_Bool elm_image_aspect_fixed_get(const Evas_Object *obj);
631 633
632#include "elm_image.eo.legacy.h" 634#include "efl_ui_image.eo.legacy.h"