hmm conflict not merged right. fix.

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

diff --git a/src/bin/test_box.c b/src/bin/test_box.c
index 534720c..0ded51c 100644 (file)
--- a/src/bin/test_box.c
+++ b/src/bin/test_box.c
@@ -201,7 +201,6 @@ _win_del(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
    Transitions_Data *tdata = data;
    if (!data) return;
    free(tdata);
-#endif
 }
 
 void

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 48a65f4..25f0100 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -620,11 +620,12 @@ _elm_win_delete_request(Ecore_Evas *ee)
    if (!win) return;
    int autodel = win->autodel;
    win->autodel_clear = &autodel;
-   evas_object_smart_callback_call(win->win_obj, SIG_DELETE_REQUEST, NULL); // FIXME: remove me.
+   evas_object_ref(win->win_obj);
    evas_object_smart_callback_call(win->win_obj, SIG_DELETE_REQUEST, NULL);
    // FIXME: if above callback deletes - then the below will be invalid
    if (autodel) evas_object_del(win->win_obj);
    else win->autodel_clear = NULL;
+   evas_object_unref(win->win_obj);
 }
 
 static void