From d52f122db48c7ee8fea19415d33605735a97bedf Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Wed, 6 Aug 2014 10:34:31 +0200 Subject: [PATCH] evas: fix evas events order and count. Before this patch, if you were hooking to any event above EVAS_OBJECT_EVENT_IMAGE_PRELOADED you will end up receiving another event instead and be fooled into receiving the right one. In the mean time I did discover that our table is missing one item, the equivalent to EVAS_CALLBACK_DEVICE_CHANGED. I don't know how to properly fix that one for now, so put NULL instead to at least avoid a random memory access. --- src/lib/evas/canvas/evas_callbacks.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c index 863c81faf5..4beac93d58 100644 --- a/src/lib/evas/canvas/evas_callbacks.c +++ b/src/lib/evas/canvas/evas_callbacks.c @@ -53,7 +53,6 @@ static const Eo_Event_Description *_legacy_evas_callback_table[EVAS_CALLBACK_LAS EVAS_OBJECT_EVENT_HOLD, EVAS_OBJECT_EVENT_CHANGED_SIZE_HINTS, EVAS_OBJECT_EVENT_IMAGE_PRELOADED, - EVAS_OBJECT_EVENT_IMAGE_RESIZE, EVAS_CANVAS_EVENT_FOCUS_IN, EVAS_CANVAS_EVENT_FOCUS_OUT, EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE, @@ -62,7 +61,9 @@ static const Eo_Event_Description *_legacy_evas_callback_table[EVAS_CALLBACK_LAS EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT, EVAS_OBJECT_EVENT_IMAGE_UNLOADED, EVAS_CANVAS_EVENT_RENDER_PRE, - EVAS_CANVAS_EVENT_RENDER_POST + EVAS_CANVAS_EVENT_RENDER_POST, + EVAS_OBJECT_EVENT_IMAGE_RESIZE, + NULL }; typedef struct