evas_callbacks.c | evas_callbacks.c | |||
---|---|---|---|---|
skipping to change at line 40 | skipping to change at line 40 | |||
void | void | |||
_evas_post_event_callback_free(Evas *e) | _evas_post_event_callback_free(Evas *e) | |||
{ | { | |||
Evas_Post_Callback *pc; | Evas_Post_Callback *pc; | |||
EINA_LIST_FREE(e->post_events, pc) | EINA_LIST_FREE(e->post_events, pc) | |||
{ | { | |||
EVAS_MEMPOOL_FREE(_mp_pc, pc); | EVAS_MEMPOOL_FREE(_mp_pc, pc); | |||
} | } | |||
_evas_unwalk(e); | ||||
} | } | |||
void | void | |||
evas_event_callback_list_post_free(Eina_Inlist **list) | evas_event_callback_list_post_free(Eina_Inlist **list) | |||
{ | { | |||
Eina_Inlist *l; | Eina_Inlist *l; | |||
/* MEM OK */ | /* MEM OK */ | |||
for (l = *list; l;) | for (l = *list; l;) | |||
{ | { | |||
skipping to change at line 301 | skipping to change at line 300 | |||
Evas_Func_Node *fn; | Evas_Func_Node *fn; | |||
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); | MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ); | |||
return; | return; | |||
MAGIC_CHECK_END(); | MAGIC_CHECK_END(); | |||
if (!func) return; | if (!func) return; | |||
if (!obj->callbacks) | if (!obj->callbacks) | |||
{ | { | |||
EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 512, ); | EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 64, ); | |||
obj->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks); | obj->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks); | |||
if (!obj->callbacks) return; | if (!obj->callbacks) return; | |||
EVAS_MEMPOOL_PREP(_mp_cb, obj->callbacks, Evas_Callbacks); | EVAS_MEMPOOL_PREP(_mp_cb, obj->callbacks, Evas_Callbacks); | |||
} | } | |||
EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 2048, ); | EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 128, ); | |||
fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node); | fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node); | |||
if (!fn) return; | if (!fn) return; | |||
EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node); | EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node); | |||
fn->func = func; | fn->func = func; | |||
fn->data = (void *)data; | fn->data = (void *)data; | |||
fn->type = type; | fn->type = type; | |||
fn->priority = priority; | fn->priority = priority; | |||
obj->callbacks->callbacks = | obj->callbacks->callbacks = | |||
eina_inlist_sorted_insert(obj->callbacks->callbacks, EINA_INLIST_GET( fn), | eina_inlist_sorted_insert(obj->callbacks->callbacks, EINA_INLIST_GET( fn), | |||
skipping to change at line 404 | skipping to change at line 403 | |||
Evas_Func_Node *fn; | Evas_Func_Node *fn; | |||
MAGIC_CHECK(e, Evas, MAGIC_EVAS); | MAGIC_CHECK(e, Evas, MAGIC_EVAS); | |||
return; | return; | |||
MAGIC_CHECK_END(); | MAGIC_CHECK_END(); | |||
if (!func) return; | if (!func) return; | |||
if (!e->callbacks) | if (!e->callbacks) | |||
{ | { | |||
EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 512, ); | EVAS_MEMPOOL_INIT(_mp_cb, "evas_callbacks", Evas_Callbacks, 64, ); | |||
e->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks); | e->callbacks = EVAS_MEMPOOL_ALLOC(_mp_cb, Evas_Callbacks); | |||
if (!e->callbacks) return; | if (!e->callbacks) return; | |||
EVAS_MEMPOOL_PREP(_mp_cb, e->callbacks, Evas_Callbacks); | EVAS_MEMPOOL_PREP(_mp_cb, e->callbacks, Evas_Callbacks); | |||
} | } | |||
EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 2048, ); | EVAS_MEMPOOL_INIT(_mp_fn, "evas_func_node", Evas_Func_Node, 128, ); | |||
fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node); | fn = EVAS_MEMPOOL_ALLOC(_mp_fn, Evas_Func_Node); | |||
if (!fn) return; | if (!fn) return; | |||
EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node); | EVAS_MEMPOOL_PREP(_mp_fn, fn, Evas_Func_Node); | |||
fn->func = func; | fn->func = func; | |||
fn->data = (void *)data; | fn->data = (void *)data; | |||
fn->type = type; | fn->type = type; | |||
fn->priority = priority; | fn->priority = priority; | |||
e->callbacks->callbacks = eina_inlist_sorted_insert(e->callbacks->callba cks, | e->callbacks->callbacks = eina_inlist_sorted_insert(e->callbacks->callba cks, | |||
EINA_INLIST_GET(fn), _callback_priority_cmp); | EINA_INLIST_GET(fn), _callback_priority_cmp); | |||
End of changes. 5 change blocks. | ||||
5 lines changed or deleted | 4 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ |