forked from enlightenment/enlightenment
parent
1cf57c6566
commit
9bd622f018
|
@ -5978,6 +5978,7 @@ _e_fm2_smart_del(Evas_Object *obj)
|
||||||
sd = evas_object_smart_data_get(obj);
|
sd = evas_object_smart_data_get(obj);
|
||||||
if (!sd) return;
|
if (!sd) return;
|
||||||
|
|
||||||
|
_e_fm2_client_monitor_list_end(obj);
|
||||||
if (sd->realpath) _e_fm2_client_monitor_del(sd->id, sd->realpath);
|
if (sd->realpath) _e_fm2_client_monitor_del(sd->id, sd->realpath);
|
||||||
_e_fm2_live_process_end(obj);
|
_e_fm2_live_process_end(obj);
|
||||||
_e_fm2_queue_free(obj);
|
_e_fm2_queue_free(obj);
|
||||||
|
|
|
@ -764,9 +764,10 @@ e_gadcon_client_new(E_Gadcon *gc, const char *name, const char *id, const char *
|
||||||
gcc->name = evas_stringshare_add(name);
|
gcc->name = evas_stringshare_add(name);
|
||||||
gcc->gadcon = gc;
|
gcc->gadcon = gc;
|
||||||
gcc->o_base = base_obj;
|
gcc->o_base = base_obj;
|
||||||
|
if (gc->clients)
|
||||||
|
gcc->id = E_GADCON_CLIENT(evas_list_data(evas_list_last(gc->clients)))->id + 1;
|
||||||
gc->clients = evas_list_append(gc->clients, gcc);
|
gc->clients = evas_list_append(gc->clients, gcc);
|
||||||
/* This must only be unique during runtime */
|
/* This must only be unique during runtime */
|
||||||
gcc->id = E_GADCON_CLIENT(evas_list_last(gc->clients))->id + 1;
|
|
||||||
if (gcc->o_base)
|
if (gcc->o_base)
|
||||||
evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_DEL,
|
evas_object_event_callback_add(gcc->o_base, EVAS_CALLBACK_DEL,
|
||||||
_e_gadcon_client_del_hook, gcc);
|
_e_gadcon_client_del_hook, gcc);
|
||||||
|
|
|
@ -443,12 +443,6 @@ static void
|
||||||
_e_fwin_free(E_Fwin *fwin)
|
_e_fwin_free(E_Fwin *fwin)
|
||||||
{
|
{
|
||||||
if (!fwin) return; //safety
|
if (!fwin) return; //safety
|
||||||
if (fwin->fad)
|
|
||||||
{
|
|
||||||
e_object_del(E_OBJECT(fwin->fad->dia));
|
|
||||||
fwin->fad = NULL;
|
|
||||||
}
|
|
||||||
if (fwin->win) e_object_del(E_OBJECT(fwin->win));
|
|
||||||
if (fwin->fm_obj) evas_object_del(fwin->fm_obj);
|
if (fwin->fm_obj) evas_object_del(fwin->fm_obj);
|
||||||
if (fwin->tbar) e_object_del(E_OBJECT(fwin->tbar));
|
if (fwin->tbar) e_object_del(E_OBJECT(fwin->tbar));
|
||||||
if (fwin->scrollframe_obj) evas_object_del(fwin->scrollframe_obj);
|
if (fwin->scrollframe_obj) evas_object_del(fwin->scrollframe_obj);
|
||||||
|
@ -469,6 +463,12 @@ _e_fwin_free(E_Fwin *fwin)
|
||||||
if (fwin->overlay_file) evas_stringshare_del(fwin->overlay_file);
|
if (fwin->overlay_file) evas_stringshare_del(fwin->overlay_file);
|
||||||
if (fwin->scrollframe_file) evas_stringshare_del(fwin->scrollframe_file);
|
if (fwin->scrollframe_file) evas_stringshare_del(fwin->scrollframe_file);
|
||||||
if (fwin->theme_file) evas_stringshare_del(fwin->theme_file);
|
if (fwin->theme_file) evas_stringshare_del(fwin->theme_file);
|
||||||
|
if (fwin->fad)
|
||||||
|
{
|
||||||
|
e_object_del(E_OBJECT(fwin->fad->dia));
|
||||||
|
fwin->fad = NULL;
|
||||||
|
}
|
||||||
|
if (fwin->win) e_object_del(E_OBJECT(fwin->win));
|
||||||
free(fwin);
|
free(fwin);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue