elm: Resolve part alias in legacy APIs only

This fixes make check.

2 files changed, 32 insertions, 27 deletions

diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 71168666ce..4db5e363a4 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -956,9 +956,7 @@ _efl_ui_layout_efl_canvas_layout_signal_signal_callback_del(Eo *obj, Efl_Ui_Layo
 // and also message handler (not implemented yet as an EO interface!)
 
 EAPI Eina_Bool
-elm_layout_content_set(Evas_Object *obj,
-                       const char *swallow,
-                       Evas_Object *content)
+elm_layout_content_set(Evas_Object *obj, const char *swallow, Evas_Object *content)
 {
    EFL_UI_LAYOUT_CHECK(obj) EINA_FALSE;
    if (!swallow)
@@ -966,6 +964,9 @@ elm_layout_content_set(Evas_Object *obj,
         swallow = elm_widget_default_content_part_get(obj);
         if (!swallow) return EINA_FALSE;
      }
+   else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE))
+     return EINA_FALSE;
+
    return efl_content_set(efl_part(obj, swallow), content);
 }
 
@@ -977,9 +978,6 @@ _efl_ui_layout_content_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, Ev
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE);
 
-   if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_FALSE))
-     return EINA_FALSE;
-
    EINA_LIST_FOREACH(sd->subs, l, sub_d)
      {
         if (sub_d->type == SWALLOW)
@@ -1052,6 +1050,7 @@ elm_layout_content_get(const Evas_Object *obj, const char *swallow)
      }
    else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE))
      return NULL;
+
    return efl_content_get(efl_part(obj, swallow));
 }
 
@@ -1061,9 +1060,6 @@ _efl_ui_layout_content_get(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part)
    const Eina_List *l;
    Efl_Ui_Layout_Sub_Object_Data *sub_d;
 
-   if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_FALSE))
-     return NULL;
-
    EINA_LIST_FOREACH(sd->subs, l, sub_d)
      {
         if ((sub_d->type != TEXT) && !strcmp(part, sub_d->part))
@@ -1078,10 +1074,17 @@ _efl_ui_layout_content_get(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part)
 }
 
 EAPI Evas_Object *
-elm_layout_content_unset(Evas_Object *obj,
-                         const char *swallow)
+elm_layout_content_unset(Evas_Object *obj, const char *swallow)
 {
    EFL_UI_LAYOUT_CHECK(obj) NULL;
+   if (!swallow)
+     {
+        swallow = elm_widget_default_content_part_get(obj);
+        if (!swallow) return NULL;
+     }
+   else if (!_elm_layout_part_aliasing_eval(obj, &swallow, EINA_FALSE))
+     return NULL;
+
    return efl_content_unset(efl_part(obj, swallow));
 }
 
@@ -1093,9 +1096,6 @@ _efl_ui_layout_content_unset(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part)
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
 
-   if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_FALSE))
-     return NULL;
-
    EINA_LIST_FOREACH(sd->subs, l, sub_d)
      {
         if ((sub_d->type == SWALLOW) && (!strcmp(part, sub_d->part)))
@@ -1254,9 +1254,6 @@ _efl_ui_layout_text_set(Eo *obj, Efl_Ui_Layout_Data *sd, const char *part, const
    Efl_Ui_Layout_Sub_Object_Data *sub_d = NULL;
    Efl_Ui_Layout_Sub_Connect *sc;
 
-   if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
-     return EINA_FALSE;
-
    EINA_LIST_FOREACH(sd->subs, l, sub_d)
      {
         if ((sub_d->type == TEXT) && (!strcmp(part, sub_d->part)))
@@ -1325,9 +1322,6 @@ _efl_ui_layout_text_get(Eo *obj, Efl_Ui_Layout_Data *sd EINA_UNUSED, const char
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
 
-   if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
-     return NULL;
-
    return edje_object_part_text_get(wd->resize_obj, part);
 }
 
@@ -2285,6 +2279,9 @@ elm_layout_text_set(Eo *obj, const char *part, const char *text)
         part = elm_widget_default_text_part_get(obj);
         if (!part) return EINA_FALSE;
      }
+   else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
+     return EINA_FALSE;
+
    efl_text_set(efl_part(obj, part), text);
    return EINA_TRUE;
 }
@@ -2297,6 +2294,9 @@ elm_layout_text_get(const Eo *obj, const char *part)
         part = elm_widget_default_text_part_get(obj);
         if (!part) return NULL;
      }
+   else if (!_elm_layout_part_aliasing_eval(obj, &part, EINA_TRUE))
+     return NULL;
+
    return efl_text_get(efl_part(obj, part));
 }
 
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 344da643cd..232bd20441 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -6543,11 +6543,14 @@ _elm_widget_focus_manager_create(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd
  * elm_object_widget_check() returns true. The below checks avoid printing out
  * undesired ERR messages. */
 EAPI void
-elm_widget_content_part_set(Evas_Object *obj,
-                            const char *part,
-                            Evas_Object *content)
+elm_widget_content_part_set(Evas_Object *obj, const char *part, Evas_Object *content)
 {
    ELM_WIDGET_CHECK(obj);
+   if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
+     {
+        elm_layout_content_set(obj, part, content);
+        return;
+     }
    if (!efl_isa(obj, EFL_PART_INTERFACE)) return;
    if (!part)
      {
@@ -6558,10 +6561,11 @@ elm_widget_content_part_set(Evas_Object *obj,
 }
 
 EAPI Evas_Object *
-elm_widget_content_part_get(const Evas_Object *obj,
-                            const char *part)
+elm_widget_content_part_get(const Evas_Object *obj, const char *part)
 {
    ELM_WIDGET_CHECK(obj) NULL;
+   if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
+     return elm_layout_content_get(obj, part);
    if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
    if (!part)
      {
@@ -6572,10 +6576,11 @@ elm_widget_content_part_get(const Evas_Object *obj,
 }
 
 EAPI Evas_Object *
-elm_widget_content_part_unset(Evas_Object *obj,
-                              const char *part)
+elm_widget_content_part_unset(Evas_Object *obj, const char *part)
 {
    ELM_WIDGET_CHECK(obj) NULL;
+   if (efl_isa(obj, EFL_UI_LAYOUT_CLASS))
+     return elm_layout_content_unset(obj, part);
    if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
    if (!part)
      {