efl_ui_widget: resolve warning about multiple defines

Summary:
the difference here is, that the macro before did not print ERR's the
one now does. Hence this commit remove two error messages.

Reviewers: devilhorns

Reviewed By: devilhorns

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D8415

diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index a510018..a1883b0 100644 (file)
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -564,12 +564,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s
           {
              if (efl_isa(pd->logical.parent, EFL_UI_WIDGET_CLASS))
                {
-                  ELM_WIDGET_DATA_GET(pd->logical.parent, logical_wd);
-                  if (!logical_wd)
-                    {
-                       ERR("Widget parent has the wrong type!");
-                       return NULL;
-                    }
+                  ELM_WIDGET_DATA_GET_OR_RETURN(pd->logical.parent, logical_wd, NULL);
                   logical_wd->logical.child_count --;
                }
              old = pd->logical.parent;
@@ -580,12 +575,7 @@ _logical_parent_eval(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *pd, Eina_Bool s
           {
              if (efl_isa(parent, EFL_UI_WIDGET_CLASS))
                {
-                  ELM_WIDGET_DATA_GET(parent, parent_wd);
-                  if (!parent_wd)
-                    {
-                       ERR("Widget parent has the wrong type!");
-                       return NULL;
-                    }
+                  ELM_WIDGET_DATA_GET_OR_RETURN(parent, parent_wd, NULL);
                   parent_wd->logical.child_count ++;
                }
              pd->logical.parent = parent;