ajwillia-ms pushed a commit to branch edi-0.3. http://git.enlightenment.org/tools/edi.git/commit/?id=8e38dbc095d3d91e949450f6d67dd7f891ef385e
commit 8e38dbc095d3d91e949450f6d67dd7f891ef385e Author: Andy Williams <a...@andywilliams.me> Date: Mon Mar 7 09:59:41 2016 +0000 Revert "Update to new eo event callback signature" This reverts commit cfdbc6b5423c3b9d31f3fa18cab4ac76a7975c71. --- elm_code/src/bin/elm_code_test_main.c | 10 ++++++---- elm_code/src/lib/widget/elm_code_widget.c | 14 +++++++++----- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/elm_code/src/bin/elm_code_test_main.c b/elm_code/src/bin/elm_code_test_main.c index 97e312c..8e2c9a0 100644 --- a/elm_code/src/bin/elm_code_test_main.c +++ b/elm_code/src/bin/elm_code_test_main.c @@ -34,22 +34,24 @@ static void _append_line(Elm_Code_File *file, const char *line) } static Eina_Bool -_elm_code_test_line_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event) +_elm_code_test_line_clicked_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, + const Eo_Event_Description *desc EINA_UNUSED, void *event_info) { Elm_Code_Line *line; - line = (Elm_Code_Line *)event->event_info; + line = (Elm_Code_Line *)event_info; printf("CLICKED line %d\n", line->number); return EO_CALLBACK_CONTINUE; } static Eina_Bool -_elm_code_test_line_done_cb(void *data EINA_UNUSED, const Eo_Event *event) +_elm_code_test_line_done_cb(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, + const Eo_Event_Description *desc EINA_UNUSED, void *event_info) { Elm_Code_Line *line; - line = (Elm_Code_Line *)event->event_info; + line = (Elm_Code_Line *)event_info; if (line->number == 1) elm_code_line_token_add(line, 17, 24, 1, ELM_CODE_TOKEN_TYPE_COMMENT); diff --git a/elm_code/src/lib/widget/elm_code_widget.c b/elm_code/src/lib/widget/elm_code_widget.c index 0341628..145d6b1 100644 --- a/elm_code/src/lib/widget/elm_code_widget.c +++ b/elm_code/src/lib/widget/elm_code_widget.c @@ -474,13 +474,14 @@ _elm_code_widget_fill(Elm_Code_Widget *widget) } static Eina_Bool -_elm_code_widget_line_cb(void *data, const Eo_Event *event) +_elm_code_widget_line_cb(void *data, Eo *obj EINA_UNUSED, + const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { Elm_Code_Line *line; Elm_Code_Widget *widget; Eina_Bool visible; - line = (Elm_Code_Line *)event->event_info; + line = (Elm_Code_Line *)event_info; widget = (Elm_Code_Widget *)data; eo_do(widget, visible = elm_obj_code_widget_line_visible_get(line)); @@ -494,7 +495,8 @@ _elm_code_widget_line_cb(void *data, const Eo_Event *event) } static Eina_Bool -_elm_code_widget_file_cb(void *data, const Eo_Event *event EINA_UNUSED) +_elm_code_widget_file_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, + void *event_info EINA_UNUSED) { Elm_Code_Widget *widget; @@ -505,7 +507,8 @@ _elm_code_widget_file_cb(void *data, const Eo_Event *event EINA_UNUSED) } static Eina_Bool -_elm_code_widget_selection_cb(void *data, const Eo_Event *event EINA_UNUSED) +_elm_code_widget_selection_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, + void *event_info EINA_UNUSED) { Elm_Code_Widget *widget; @@ -516,7 +519,8 @@ _elm_code_widget_selection_cb(void *data, const Eo_Event *event EINA_UNUSED) } static Eina_Bool -_elm_code_widget_selection_clear_cb(void *data, const Eo_Event *event EINA_UNUSED) +_elm_code_widget_selection_clear_cb(void *data, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, + void *event_info EINA_UNUSED) { Elm_Code_Widget *widget; --