summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-02 11:50:51 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 10:05:00 +0000
commit306f50bf5c53d4f09a8c72b15921cd666adef923 (patch)
treecd9e211cfcd173c1b92cbb9a220bf420601b4e22
parent9274efb94c47833aa4dc89832c7f2efcccea19b4 (diff)
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.
-rw-r--r--src/examples/performance/graphical.c2
-rw-r--r--src/lib/elm_win.c6
2 files changed, 2 insertions, 6 deletions
diff --git a/src/examples/performance/graphical.c b/src/examples/performance/graphical.c
index 9bc60e827..1390ac73d 100644
--- a/src/examples/performance/graphical.c
+++ b/src/examples/performance/graphical.c
@@ -452,8 +452,6 @@ _init_scene(Evas_Object *img)
452 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0), 452 evas_canvas3d_light_diffuse_set(1.0, 1.0, 1.0, 1.0),
453 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0), 453 evas_canvas3d_light_specular_set(1.0, 1.0, 1.0, 1.0),
454 evas_canvas3d_light_projection_perspective_set(globalGraphical.angle / 5, 1.0, 1.0, 1000.0), 454 evas_canvas3d_light_projection_perspective_set(globalGraphical.angle / 5, 1.0, 1.0, 1000.0),
455 /*evas_canvas3d_light_projection_perspective_set(value, ...) =>
456 evas_canvas3d_light_spot_cutoff_set(~(value / 3))*/
457 evas_canvas3d_light_spot_cutoff_set(globalGraphical.angle / 15)); 455 evas_canvas3d_light_spot_cutoff_set(globalGraphical.angle / 15));
458 456
459 globalGraphical.light_node = 457 globalGraphical.light_node =
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 03b3006df..f3806af63 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -67,8 +67,7 @@ static const Elm_Win_Trap *trap = NULL;
67 { \ 67 { \
68 edje_object_signal_emit(cursd->edje, \ 68 edje_object_signal_emit(cursd->edje, \
69 "elm,action,hide_blocker", "elm"); \ 69 "elm,action,hide_blocker", "elm"); \
70 eo_do(cursd->main_menu, eo_event_callback_call \ 70 eo_event_callback_call(cursd->main_menu, ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL); \
71 (ELM_MENU_EVENT_ELM_ACTION_UNBLOCK_MENU, NULL)); \
72 } \ 71 } \
73 } 72 }
74 73
@@ -84,8 +83,7 @@ static const Elm_Win_Trap *trap = NULL;
84 { \ 83 { \
85 edje_object_signal_emit(cursd->edje, \ 84 edje_object_signal_emit(cursd->edje, \
86 "elm,action,show_blocker", "elm"); \ 85 "elm,action,show_blocker", "elm"); \
87 eo_do(cursd->main_menu, eo_event_callback_call \ 86 eo_event_callback_call(cursd->main_menu, ELM_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL); \
88 (ELM_WIN_EVENT_ELM_ACTION_BLOCK_MENU, NULL)); \
89 } \ 87 } \
90 } 88 }
91 89