[EGIT] [core/efl] master 01/03: widget: Avoid ERR in elm_object_content_ APIs

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

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

commit 9452a4ac497100ecc71eca5f4a37cfc655b45a53
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Thu Jun 29 19:09:27 2017 +0900

    widget: Avoid ERR in elm_object_content_ APIs
    
    If content_part_{set,get,unset} are called on a widget that
    is not a layout (or flip, and a few others), then some ERR
    messages would be printed out.
    
    We hide these ERR messages as all elm_object APIs should be
    callable on an object for which elm_object_widget_check()
    returns true.
    
    Ref T5629
---
 src/lib/elementary/elm_widget.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index b83bf2772b..915a75e7a4 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -3954,6 +3954,7 @@ elm_widget_content_part_set(Evas_Object *obj,
                             Evas_Object *content)
 {
    ELM_WIDGET_CHECK(obj);
+   if (!efl_isa(obj, EFL_PART_INTERFACE)) return;
    efl_content_set(efl_part(obj, part), content);
 }
 
@@ -3962,6 +3963,7 @@ elm_widget_content_part_get(const Evas_Object *obj,
                             const char *part)
 {
    ELM_WIDGET_CHECK(obj) NULL;
+   if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
    return efl_content_get(efl_part(obj, part));
 }
 
@@ -3970,6 +3972,7 @@ elm_widget_content_part_unset(Evas_Object *obj,
                               const char *part)
 {
    ELM_WIDGET_CHECK(obj) NULL;
+   if (!efl_isa(obj, EFL_PART_INTERFACE)) return NULL;
    return efl_content_unset(efl_part(obj, part));
 }
 

--