aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-03-03 20:27:23 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-03-03 21:53:42 +0900
commit59ac935123633229649eb05b890c445f5dc0ce01 (patch)
tree3359cc3de38fc4580ff5d22bbcdd3141996a6d3e
parentMigrate elementary to the new Eo4 syntax (diff)
downloadelementary-devs/jpeg/work.tar.gz
Elm.Image: Adapt to recent changes in Efl.Imagedevs/jpeg/work
-rw-r--r--src/lib/elm_image.c4
-rw-r--r--src/lib/elm_image.eo6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/elm_image.c b/src/lib/elm_image.c
index 411900414..4df9982ff 100644
--- a/src/lib/elm_image.c
+++ b/src/lib/elm_image.c
@@ -1370,7 +1370,7 @@ elm_image_prescale_set(Evas_Object *obj,
}
EOLIAN static void
-_elm_image_efl_image_load_size_set(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int w, int h)
+_elm_image_efl_image_load_load_size_set(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int w, int h)
{
if (w > h)
sd->load_size = w;
@@ -1389,7 +1389,7 @@ elm_image_prescale_get(const Evas_Object *obj)
}
EOLIAN static void
-_elm_image_efl_image_load_size_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h)
+_elm_image_efl_image_load_load_size_get(Eo *obj EINA_UNUSED, Elm_Image_Data *sd, int *w, int *h)
{
if (w) *w = sd->load_size;
if (h) *h = sd->load_size;
diff --git a/src/lib/elm_image.eo b/src/lib/elm_image.eo
index b45887202..01dbfa095 100644
--- a/src/lib/elm_image.eo
+++ b/src/lib/elm_image.eo
@@ -41,7 +41,7 @@ struct Elm.Image.Error
open_error: Eina.Bool;
}
-class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
+class Elm.Image (Elm.Widget, Efl.File, Efl.Image_Load, Evas.Clickable_Interface,
Edje.Object,
Elm.Interface_Atspi_Image, Elm.Interface_Atspi_Widget_Action,
Efl.Player)
@@ -317,8 +317,8 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
Efl.File.async.set;
Efl.File.async.get;
Efl.File.async_wait;
- Efl.Image.load_size.set;
- Efl.Image.load_size.get;
+ Efl.Image_Load.load_size.set;
+ Efl.Image_Load.load_size.get;
Efl.Image.smooth_scale.set;
Efl.Image.smooth_scale.get;
Efl.Player.playable.get;