summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-05-24 21:44:27 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-05-25 15:00:34 +0900
commitd2ba9866fbd6c6b2b26715180fa132ca4b632cc4 (patch)
treec64164c9ef2c63f9d9f240e9919f87acc1aa6839
parentc983b3e1e67d933f2496b3f8785f492041235f93 (diff)
Edje: Remove impossible code
With EO we can't possibly call an EO function with NULL.
-rw-r--r--src/lib/edje/edje_util.c24
1 files changed, 6 insertions, 18 deletions
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index 73c34d0bd4..a01eda4112 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
3846 rp = _swallow_real_part_get(obj_swallow); 3846 rp = _swallow_real_part_get(obj_swallow);
3847 if (!rp) return EINA_FALSE; 3847 if (!rp) return EINA_FALSE;
3848 3848
3849 if (obj) 3849 EINA_LIST_FOREACH(ed->user_defined, l, eud)
3850 { 3850 if ((eud->type == EDJE_USER_SWALLOW) && (eud->u.swallow.child == obj_swallow))
3851 if (!ed && obj) 3851 {
3852 { 3852 _edje_user_definition_free(eud);
3853 ERR("edje_object_part_unswallow called on a non Edje object ('%s').", 3853 return EINA_FALSE;
3854 evas_object_type_get(obj)); 3854 }
3855 return EINA_FALSE;
3856 }
3857 else
3858 {
3859 EINA_LIST_FOREACH(ed->user_defined, l, eud)
3860 if (eud->type == EDJE_USER_SWALLOW && eud->u.swallow.child == obj_swallow)
3861 {
3862 _edje_user_definition_free(eud);
3863 return EINA_FALSE;
3864 }
3865 }
3866 }
3867 3855
3868 _edje_real_part_swallow_clear(ed, rp); 3856 _edje_real_part_swallow_clear(ed, rp);
3869 rp->typedata.swallow->swallowed_object = NULL; 3857 rp->typedata.swallow->swallowed_object = NULL;