elm: Fix build (use efl_ui_image.eo)
authorJean-Philippe Andre <jp.andre@samsung.com>
Tue, 31 May 2016 11:44:41 +0000 (20:44 +0900)
committerJean-Philippe Andre <jp.andre@samsung.com>
Tue, 31 May 2016 11:51:31 +0000 (20:51 +0900)
src/lib/elementary/efl_ui_image.c
src/lib/elementary/elm_image_eo.h
src/lib/elementary/elm_image_legacy.h

index a2f43aa..3db96c9 100644 (file)
@@ -972,7 +972,7 @@ _efl_ui_image_smart_download_done(void *data, Elm_Url *url, Eina_Binbuf *downloa
    sd->remote = NULL;
    if (!ret)
      {
-        Elm_Image_Error err = { 0, EINA_TRUE };
+        Efl_Ui_Image_Error err = { 0, EINA_TRUE };
 
         free(sd->remote_data);
         sd->remote_data = NULL;
@@ -997,7 +997,7 @@ _efl_ui_image_smart_download_cancel(void *data, Elm_Url *url EINA_UNUSED, int er
 {
    Eo *obj = data;
    Efl_Ui_Image_Data *sd = eo_data_scope_get(obj, MY_CLASS);
-   Elm_Image_Error err = { error, EINA_FALSE };
+   Efl_Ui_Image_Error err = { error, EINA_FALSE };
 
    eo_event_callback_call(obj, EFL_UI_IMAGE_EVENT_DOWNLOAD_ERROR, &err);
 
@@ -1009,7 +1009,7 @@ static void
 _efl_ui_image_smart_download_progress(void *data, Elm_Url *url EINA_UNUSED, double now, double total)
 {
    Eo *obj = data;
-   Elm_Image_Progress progress;
+   Efl_Ui_Image_Progress progress;
 
    progress.now = now;
    progress.total = total;
index 22896e7..2c7feb8 100644 (file)
@@ -4,7 +4,7 @@
  * @{
  */
 
-#include "elm_image.eo.h"
+#include "efl_ui_image.eo.h"
 
 /**
  * @}
index 8bed5ca..ed9f6f2 100644 (file)
@@ -10,6 +10,8 @@
  */
 EAPI Evas_Object     *elm_image_add(Evas_Object *parent);
 
+typedef Evas_Object Elm_Image;
+
 /**
  * Set the file that will be used as the image's source.
  *
@@ -629,4 +631,4 @@ EAPI void elm_image_aspect_fixed_set(Evas_Object *obj, Eina_Bool fixed);
  */
 EAPI Eina_Bool elm_image_aspect_fixed_get(const Evas_Object *obj);
 
-#include "elm_image.eo.legacy.h"
+#include "efl_ui_image.eo.legacy.h"