Revert "efl_ui_widget: resolve warning about multiple defines"
authorXavi Artigas <xavierartigas@yahoo.es>
Tue, 19 Mar 2019 15:50:13 +0000 (16:50 +0100)
committerYeongjong Lee <yj34.lee@samsung.com>
Tue, 2 Apr 2019 03:45:17 +0000 (12:45 +0900)
This reverts commit 9012742f9a6e0ac09f34b7df23b1ac8d166239e1.

I landed this too hastily.

src/lib/elementary/efl_ui_widget.c

index cbac01c..a510018 100644 (file)
@@ -565,6 +565,11 @@ _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;
+                    }
                   logical_wd->logical.child_count --;
                }
              old = pd->logical.parent;
@@ -576,6 +581,11 @@ _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;
+                    }
                   parent_wd->logical.child_count ++;
                }
              pd->logical.parent = parent;