From 3d63c5fd824bfe68b145f806457a3e5abdf77ed3 Mon Sep 17 00:00:00 2001
From: cedric <cedric>
Date: Wed, 13 Jun 2012 08:51:02 +0000
Subject: [PATCH] edje: cleanup the right callback.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@72074 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
---
 src/lib/edje_util.c | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index 53d4fab..0c8c754 100644
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -82,7 +82,6 @@ _edje_user_definition_free(Edje_User_Defined *eud)
 	child = eud->u.swallow.child;
 	rp = _edje_real_part_recursive_get(eud->ed, eud->part);
 	_edje_real_part_swallow_clear(rp);
-        rp->swallowed_object = NULL;
 	break;
       case EDJE_USER_BOX_PACK:
 	child = eud->u.box.child;
@@ -2812,21 +2811,7 @@ edje_object_part_unswallow(Evas_Object *obj, Evas_Object *obj_swallow)
                }
           }
 
-	evas_object_smart_member_del(rp->swallowed_object);
-	evas_object_event_callback_del_full(rp->swallowed_object,
-                                            EVAS_CALLBACK_FREE,
-                                            _edje_object_part_swallow_free_cb,
-                                            rp);
-	evas_object_event_callback_del_full(rp->swallowed_object,
-                                            EVAS_CALLBACK_CHANGED_SIZE_HINTS,
-                                            _edje_object_part_swallow_changed_hints_cb,
-                                            rp);
-	evas_object_clip_unset(rp->swallowed_object);
-	evas_object_data_del(rp->swallowed_object, "\377 edje.swallowing_part");
-
-	if (rp->part->mouse_events)
-	  _edje_callbacks_del(rp->swallowed_object, rp->edje);
-	_edje_callbacks_focus_del(rp->swallowed_object, rp->edje);
+	_edje_real_part_swallow_clear(rp);
 
 	rp->swallowed_object = NULL;
 	rp->swallow_params.min.w = 0;
@@ -4921,8 +4906,18 @@ void
 _edje_object_part_swallow_free_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
    Edje_Real_Part *rp;
+   Edje_User_Defined *eud;
+   Eina_List *l;
 
    rp = data;
+
+   EINA_LIST_FOREACH(rp->edje->user_defined, l, eud)
+     if (eud->type == EDJE_USER_SWALLOW && eud->u.swallow.child == obj)
+       {
+          _edje_user_definition_free(eud);
+          break;
+       }
+
    _edje_real_part_swallow_clear(rp);
    rp->swallowed_object = NULL;
 
@@ -5092,7 +5087,7 @@ _edje_real_part_swallow_clear(Edje_Real_Part *rp)
 {
    evas_object_smart_member_del(rp->swallowed_object);
    evas_object_event_callback_del_full(rp->swallowed_object,
-                                       EVAS_CALLBACK_FREE,
+                                       EVAS_CALLBACK_DEL,
                                        _edje_object_part_swallow_free_cb,
                                        rp);
    evas_object_event_callback_del_full(rp->swallowed_object,
-- 
2.7.4