From: Jean-Philippe Andre <jp.andre@samsung.com>
Date: Wed, 20 Dec 2017 06:23:23 +0000 (+0900)
Subject: elm: Fix duplicate EO API
X-Git-Tag: submit/sandbox/upgrade/efl120/20180319.053334~563
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f24ca2a041f14718f6f67f0172c8e33a4def374;p=platform%2Fupstream%2Fefl.git

elm: Fix duplicate EO API

elm_interface_scrollable is used by legacy but isn't public API.
---

diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index f7f0048..071dc45 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 6db2545..889efa2 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 {
          }