enlightenment
/
enlightenment-module-edgar
7
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Follow recent Eo changes

This commit is contained in:
Davide Andreoli 2016-03-18 21:30:21 +01:00
parent 4386c386e4
commit f23d28a587
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/e_mod_edgar.c
View File

@ -354,19 +354,19 @@ edgar_theme_object_set(Edgar_Py_Gadget *gadget, Evas_Object *obj, const char *gr
}
static Eina_Bool
edgar_popup_del_cb(void *data, Eo *obj, const Eo_Event_Description *desc, void *event_info)
edgar_popup_del_cb(void *data, const Eo_Event *event)
{
Edgar_Py_Gadget *gadget = data;
// call the popup_destoyed() method of the gadget.
PyObject *pyobj = object_from_instance(obj);
PyObject *pyobj = object_from_instance(event->obj);
PyObject *ret = PyObject_CallMethod(gadget->instance, "popup_destroyed",
"(S)", pyobj);
PY_ON_ERROR_RETURN(!ret, EO_CALLBACK_CONTINUE, "Cannot call popup_destroyed()");
Py_DECREF(pyobj);
Py_DECREF(ret);
gadget->pops_obj = eina_list_remove(gadget->pops_obj, obj);
gadget->pops_obj = eina_list_remove(gadget->pops_obj, event->obj);
return EO_CALLBACK_CONTINUE;
}
@ -386,8 +386,8 @@ edgar_popup_new(Edgar_Py_Gadget *gadget, E_Gadcon_Client *gcc)
}
// NOTE: del cb with priority to be called before the python-efl one.
// Otherwise python-efl delete the python obj too soon
eo_do(content, eo_event_callback_priority_add(
EO_EV_DEL, EO_CALLBACK_PRIORITY_BEFORE, edgar_popup_del_cb, gadget));
eo_event_callback_priority_add(content, EO_BASE_EVENT_DEL,
EO_CALLBACK_PRIORITY_BEFORE, edgar_popup_del_cb, gadget);
// call the popup_created() method of the gadget.
PyObject *pyobj = object_from_instance(content);