enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

hmm conflict not merged right. fix. 

SVN revision: 60177
This commit is contained in:
Carsten Haitzler 2011-06-10 07:08:34 +00:00
parent 1e9bdf652b
commit af679f1cc7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/elementary/src/bin/test_box.c
View File

@ -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

3
legacy/elementary/src/lib/elm_win.c
View File

@ -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