cedric -> REVERT 2. LOTs of valgrind probelsm from this patch and

crashes too in real life. try with valgrind again some tiome. rp's
(parts) freed before callbacks called thus cb data is invalid by the
time its called.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/edje@72090 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/edje_util.c b/src/lib/edje_util.c
index 53d4fab..47a7322 100644 (file)
--- a/src/lib/edje_util.c
+++ b/src/lib/edje_util.c
@@ -80,9 +80,7 @@ _edje_user_definition_free(Edje_User_Defined *eud)
      {
       case EDJE_USER_SWALLOW:
        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;
+       edje_object_part_unswallow(eud->ed->obj, child);
        break;
       case EDJE_USER_BOX_PACK:
        child = eud->u.box.child;
@@ -2816,7 +2814,7 @@ edje_object_part_unswallow(Evas_Object *obj, Evas_Object *obj_swallow)
        evas_object_event_callback_del_full(rp->swallowed_object,
                                             EVAS_CALLBACK_FREE,
                                             _edje_object_part_swallow_free_cb,
-                                            rp);
+                                            rp->edje->obj);
        evas_object_event_callback_del_full(rp->swallowed_object,
                                             EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                             _edje_object_part_swallow_changed_hints_cb,
@@ -4920,12 +4918,10 @@ _edje_block_violate(Edje *ed)
 void
 _edje_object_part_swallow_free_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Edje_Real_Part *rp;
-
-   rp = data;
-   _edje_real_part_swallow_clear(rp);
-   rp->swallowed_object = NULL;
+   Evas_Object *edje_obj;
 
+   edje_obj = data;
+   edje_object_part_unswallow(edje_obj, obj);
    return;
 }
 
@@ -5056,7 +5052,7 @@ _edje_real_part_swallow(Edje_Real_Part *rp,
    evas_object_event_callback_add(rp->swallowed_object,
                                   EVAS_CALLBACK_DEL,
                                  _edje_object_part_swallow_free_cb,
-                                 rp);
+                                 rp->edje->obj);
    evas_object_event_callback_add(rp->swallowed_object,
                                   EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                  _edje_object_part_swallow_changed_hints_cb,
@@ -5094,7 +5090,7 @@ _edje_real_part_swallow_clear(Edje_Real_Part *rp)
    evas_object_event_callback_del_full(rp->swallowed_object,
                                        EVAS_CALLBACK_FREE,
                                        _edje_object_part_swallow_free_cb,
-                                       rp);
+                                       rp->edje->obj);
    evas_object_event_callback_del_full(rp->swallowed_object,
                                        EVAS_CALLBACK_CHANGED_SIZE_HINTS,
                                        _edje_object_part_swallow_changed_hints_cb,