enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

set runner gadget instance data to gadget object, not sandbox object 

fixes crash when configuring gadget
This commit is contained in:
Mike Blumenkrantz 2018-01-05 12:31:15 -05:00
parent 6549353b53
commit 8bd02aca70
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/e_gadget_runner.c
View File

@ -760,7 +760,6 @@ gadget_create(Evas_Object *parent, Config_Item *ci, int *id, E_Gadget_Site_Orien
evas_object_smart_callback_add(inst->obj, "popup_added", popup_added, inst); evas_object_smart_callback_add(inst->obj, "popup_added", popup_added, inst);
e_comp_wl_extension_action_route_interface_get(&ar_version); e_comp_wl_extension_action_route_interface_get(&ar_version);
efl_wl_global_add(inst->obj, &action_route_interface, ar_version, inst, ar_bind); efl_wl_global_add(inst->obj, &action_route_interface, ar_version, inst, ar_bind);
evas_object_data_set(inst->obj, "runner", inst);
evas_object_event_callback_add(inst->obj, EVAS_CALLBACK_MOUSE_DOWN, mouse_down, inst); evas_object_event_callback_add(inst->obj, EVAS_CALLBACK_MOUSE_DOWN, mouse_down, inst);
evas_object_smart_callback_add(parent, "gadget_created", runner_created, inst); evas_object_smart_callback_add(parent, "gadget_created", runner_created, inst);
evas_object_smart_callback_add(parent, "gadget_removed", runner_removed, inst); evas_object_smart_callback_add(parent, "gadget_removed", runner_removed, inst);
@ -769,6 +768,7 @@ gadget_create(Evas_Object *parent, Config_Item *ci, int *id, E_Gadget_Site_Orien
runner_run(inst); runner_run(inst);
ecore_exe_data_set(inst->exe, inst); ecore_exe_data_set(inst->exe, inst);
inst->base.obj = inst->box = elm_box_add(e_comp->elm); inst->base.obj = inst->box = elm_box_add(e_comp->elm);
evas_object_data_set(inst->box, "runner", inst);
evas_object_event_callback_add(inst->box, EVAS_CALLBACK_DEL, runner_del, inst); evas_object_event_callback_add(inst->box, EVAS_CALLBACK_DEL, runner_del, inst);
evas_object_event_callback_add(inst->obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, runner_hints, inst); evas_object_event_callback_add(inst->obj, EVAS_CALLBACK_CHANGED_SIZE_HINTS, runner_hints, inst);
elm_box_homogeneous_set(inst->box, 1); elm_box_homogeneous_set(inst->box, 1);