From 8b45a1dc94b04af95da3fd9e4a383471b4448bf8 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Wed, 2 Mar 2016 11:50:51 +0000 Subject: [PATCH] Manually migrate some eo_do for the migration script The script doesn't handle a few corner cases well. Update the code manually so it doesn't have to deal with those. --- legacy/elementary/src/examples/performance/graphical.c | 2 -- legacy/elementary/src/lib/elm_win.c | 6 ++---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/legacy/elementary/src/examples/performance/graphical.c b/legacy/elementary/src/examples/performance/graphical.c index 9bc60e8272..1390ac73d9 100644 --- a/legacy/elementary/src/examples/performance/graphical.c +++ b/legacy/elementary/src/examples/performance/graphical.c @@ -452,8 +452,6 @@ _init_scene(Evas_Object *img) evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0), evas_canvas3d_light_projection_perspective_set(globalGraphical.angle / 5, 1.0, 1.0, 1000.0), - /*evas_canvas3d_light_projection_perspective_set(value, ...) => - evas_canvas3d_light_spot_cutoff_set(~(value / 3))*/ evas_canvas3d_light_spot_cutoff_set(globalGraphical.angle / 15)); globalGraphical.light_node = diff --git a/legacy/elementary/src/lib/elm_win.c b/legacy/elementary/src/lib/elm_win.c index 03b3006df7..f3806af637 100644 --- a/legacy/elementary/src/lib/elm_win.c +++ b/legacy/elementary/src/lib/elm_win.c @@ -67,8 +67,7 @@ static const Elm_Win_Trap *trap = NULL; { \ edje_object_signal_emit(cursd->edje, \ "elm,action,hide_blocker", "elm"); \ - eo_do(cursd->main_menu, eo_event_callback_call \ - (ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL)); \ + eo_event_callback_call(cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL); \ } \ } @@ -84,8 +83,7 @@ static const Elm_Win_Trap *trap = NULL; { \ edje_object_signal_emit(cursd->edje, \ "elm,action,show_blocker", "elm"); \ - eo_do(cursd->main_menu, eo_event_callback_call \ - (ELM_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL)); \ + eo_event_callback_call(cursd->main_menu, ELM_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); \ } \ }