[EGIT] [core/efl] master 01/03: Edje: Remove impossible code

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

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

commit d2ba9866fbd6c6b2b26715180fa132ca4b632cc4
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Tue May 24 21:44:27 2016 +0900

    Edje: Remove impossible code
    
    With EO we can't possibly call an EO function
    with NULL.
---
 src/lib/edje/edje_util.c | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 73c34d0..a01eda4 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -3846,24 +3846,12 @@ _edje_object_efl_container_content_remove(Eo *obj 
EINA_UNUSED, Edje *ed, Evas_Ob
    rp = _swallow_real_part_get(obj_swallow);
    if (!rp) return EINA_FALSE;
 
-   if (obj)
-     {
-        if (!ed && obj)
-          {
-             ERR("edje_object_part_unswallow called on a non Edje object 
('%s').",
-                 evas_object_type_get(obj));
-             return EINA_FALSE;
-          }
-        else
-          {
-             EINA_LIST_FOREACH(ed->user_defined, l, eud)
-               if (eud->type == EDJE_USER_SWALLOW && eud->u.swallow.child == 
obj_swallow)
-                 {
-                    _edje_user_definition_free(eud);
-                    return EINA_FALSE;
-                 }
-          }
-     }
+   EINA_LIST_FOREACH(ed->user_defined, l, eud)
+     if ((eud->type == EDJE_USER_SWALLOW) && (eud->u.swallow.child == 
obj_swallow))
+       {
+          _edje_user_definition_free(eud);
+          return EINA_FALSE;
+       }
 
    _edje_real_part_swallow_clear(ed, rp);
    rp->typedata.swallow->swallowed_object = NULL;

--