jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=c2a5ee65d5835245e6e22e95cbf27bed6d959db4

commit c2a5ee65d5835245e6e22e95cbf27bed6d959db4
Author: Jean-Philippe Andre <[email protected]>
Date:   Wed Dec 20 15:23:23 2017 +0900

    elm: Fix duplicate EO API
    
    elm_interface_scrollable is used by legacy but isn't public API.
---
 src/lib/elementary/elm_interface_scrollable.c  | 2 +-
 src/lib/elementary/elm_interface_scrollable.eo | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/elementary/elm_interface_scrollable.c 
b/src/lib/elementary/elm_interface_scrollable.c
index f7f004893c..071dc458d8 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -3955,7 +3955,7 @@ _elm_scroll_content_del_cb(void *data,
 }
 
 EOLIAN static void
-_elm_interface_scrollable_content_set(Eo *obj, 
Elm_Scrollable_Smart_Interface_Data *sid, Evas_Object *content)
+_elm_interface_scrollable_scrollable_content_set(Eo *obj, 
Elm_Scrollable_Smart_Interface_Data *sid, Evas_Object *content)
 {
    Evas_Coord w = 0, h = 0;
    Evas_Object *o;
diff --git a/src/lib/elementary/elm_interface_scrollable.eo 
b/src/lib/elementary/elm_interface_scrollable.eo
index 6db254567a..889efa214b 100644
--- a/src/lib/elementary/elm_interface_scrollable.eo
+++ b/src/lib/elementary/elm_interface_scrollable.eo
@@ -456,7 +456,7 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, 
Efl.Ui.Focus.Manager.Sub, Elm.
             scroll_right_cb: Elm_Interface_Scrollable_Cb @nullable; [[The 
callback]]
          }
       }
-      @property content {
+      @property scrollable_content {
         [[Content property]]
          set {
          }

-- 


Reply via email to