From df7b19090a4306da7bbba5386701b53f50754055 Mon Sep 17 00:00:00 2001 From: Cedric Bail Date: Fri, 5 Jul 2013 10:18:49 +0900 Subject: [PATCH] edje: simplify the logic and make code easier to read. --- src/lib/edje/edje_load.c | 16 +++------------- src/lib/edje/edje_util.c | 3 +-- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c index 0bfa937f5b..5b1010f8f2 100644 --- a/src/lib/edje/edje_load.c +++ b/src/lib/edje/edje_load.c @@ -1317,19 +1317,9 @@ _edje_file_del(Edje *ed) if (rp->object) { - switch (rp->part->type) - { - case EDJE_PART_TYPE_GROUP: - case EDJE_PART_TYPE_SWALLOW: - case EDJE_PART_TYPE_EXTERNAL: - _edje_callbacks_focus_del(rp->object, ed); - break; - default: - if (rp->part->mouse_events) - _edje_callbacks_del(rp->object, ed); - break; - } - evas_object_del(rp->object); + _edje_callbacks_focus_del(rp->object, ed); + _edje_callbacks_del(rp->object, ed); + evas_object_del(rp->object); } if (rp->custom) diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c index 9df5ce14ce..4c955f4063 100644 --- a/src/lib/edje/edje_util.c +++ b/src/lib/edje/edje_util.c @@ -6493,8 +6493,7 @@ _edje_real_part_swallow_clear(Edje *ed, Edje_Real_Part *rp) rp); evas_object_clip_unset(rp->typedata.swallow->swallowed_object); evas_object_data_del(rp->typedata.swallow->swallowed_object, "\377 edje.swallowing_part"); - if (rp->part->mouse_events) - _edje_callbacks_del(rp->typedata.swallow->swallowed_object, ed); + _edje_callbacks_del(rp->typedata.swallow->swallowed_object, ed); _edje_callbacks_focus_del(rp->typedata.swallow->swallowed_object, ed); rp->typedata.swallow->swallowed_object = NULL; }