vtorri
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix some crashes with start gadget deletion 

ref T6623
This commit is contained in:
Mike Blumenkrantz 2018-01-18 15:59:16 -05:00
parent e787a71048
commit 08bff48f71
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/modules/start/start.c
View File

@ -5,6 +5,7 @@ typedef struct _Instance Instance;
struct _Instance
{
Evas_Object *site;
Evas_Object *o_button;
E_Menu *main_menu;
};
@ -164,6 +165,14 @@ _button_cb_mouse_down(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNU
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
}
static void
_anchor_change(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Instance *inst = data;
do_orient(inst, e_gadget_site_orient_get(obj), e_gadget_site_anchor_get(obj));
}
static void
start_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
@ -174,24 +183,18 @@ start_del(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
e_menu_post_deactivate_callback_set(inst->main_menu, NULL, NULL);
e_object_del(E_OBJECT(inst->main_menu));
}
evas_object_smart_callback_del_full(inst->site, "gadget_site_anchor", _anchor_change, inst);
free(inst);
}
static void
_anchor_change(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Instance *inst = data;
do_orient(inst, e_gadget_site_orient_get(obj), e_gadget_site_anchor_get(obj));
}
static void
_gadget_created(void *data, Evas_Object *obj, void *event_info)
{
Instance *inst = data;
if (event_info == inst->o_button)
do_orient(inst, e_gadget_site_orient_get(obj), e_gadget_site_anchor_get(obj));
if (event_info != inst->o_button) return;
do_orient(inst, e_gadget_site_orient_get(obj), e_gadget_site_anchor_get(obj));
evas_object_smart_callback_del_full(obj, "gadget_created", _gadget_created, inst);
}
EINTERN Evas_Object *
@ -203,6 +206,7 @@ start_create(Evas_Object *parent, int *id, E_Gadget_Site_Orient orient)
if (e_gadget_site_is_desklock(parent)) return NULL;
if (*id == 0) *id = 1;
inst = E_NEW(Instance, 1);
inst->site = parent;
o = elm_layout_add(parent);