davemds pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/edgar.git/commit/?id=f23d28a58771bb3c4d357f94e22320d489d71570
commit f23d28a58771bb3c4d357f94e22320d489d71570
Author: Dave Andreoli <d...@gurumeditation.it>
Date: Fri Mar 18 21:30:21 2016 +0100
Follow recent Eo changes
---
src/e_mod_edgar.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/e_mod_edgar.c b/src/e_mod_edgar.c
index 33d6f14..67be2c8 100644
--- a/src/e_mod_edgar.c
+++ b/src/e_mod_edgar.c
@@ -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);
--
