summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2014-08-06 10:34:31 +0200
committerCedric BAIL <cedric@osg.samsung.com>2014-09-02 15:34:56 +0200
commitb1caa37177d4f5a32b57e23296bd26d64d0b7449 (patch)
treec3051aaed000d8cdc9d069df75825f35c5223d3c
parent380756f6fb0d7cddf37a9f928650b3e88940b9d7 (diff)
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.
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index 654c5d033a..1549557c8d 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -103,7 +103,6 @@ static const Eo_Event_Description *_legacy_evas_callback_table[EVAS_CALLBACK_LAS
103 EVAS_OBJECT_EVENT_HOLD, 103 EVAS_OBJECT_EVENT_HOLD,
104 EVAS_OBJECT_EVENT_CHANGED_SIZE_HINTS, 104 EVAS_OBJECT_EVENT_CHANGED_SIZE_HINTS,
105 EVAS_OBJECT_EVENT_IMAGE_PRELOADED, 105 EVAS_OBJECT_EVENT_IMAGE_PRELOADED,
106 EVAS_OBJECT_EVENT_IMAGE_RESIZE,
107 EVAS_CANVAS_EVENT_FOCUS_IN, 106 EVAS_CANVAS_EVENT_FOCUS_IN,
108 EVAS_CANVAS_EVENT_FOCUS_OUT, 107 EVAS_CANVAS_EVENT_FOCUS_OUT,
109 EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE, 108 EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE,
@@ -112,7 +111,9 @@ static const Eo_Event_Description *_legacy_evas_callback_table[EVAS_CALLBACK_LAS
112 EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT, 111 EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT,
113 EVAS_OBJECT_EVENT_IMAGE_UNLOADED, 112 EVAS_OBJECT_EVENT_IMAGE_UNLOADED,
114 EVAS_CANVAS_EVENT_RENDER_PRE, 113 EVAS_CANVAS_EVENT_RENDER_PRE,
115 EVAS_CANVAS_EVENT_RENDER_POST 114 EVAS_CANVAS_EVENT_RENDER_POST,
115 EVAS_OBJECT_EVENT_IMAGE_RESIZE,
116 NULL
116}; 117};
117 118
118typedef struct 119typedef struct