summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-06 15:47:21 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:32 +0300
commit1959634ac3b61f41ad321ca10a64d1e9460a4c7c (patch)
tree782d2a8b16c0d5a4f0c61982c5f83e23daa55de1
parent9e18fd6cb39c9d762ab737176887ab6d001d80dd (diff)
elm_actionslider, elm_map: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_actionslider.c52
-rw-r--r--src/lib/elm_actionslider.eo2
-rw-r--r--src/lib/elm_map.c110
-rw-r--r--src/lib/elm_map.eo5
4 files changed, 92 insertions, 77 deletions
diff --git a/src/lib/elm_actionslider.c b/src/lib/elm_actionslider.c
index 8f658472e..c2e86898c 100644
--- a/src/lib/elm_actionslider.c
+++ b/src/lib/elm_actionslider.c
@@ -154,13 +154,16 @@ _drag_button_move_cb(void *data,
154 edje_object_part_drag_value_get 154 edje_object_part_drag_value_get
155 (wd->resize_obj, "elm.drag_button_base", &pos, NULL); 155 (wd->resize_obj, "elm.drag_button_base", &pos, NULL);
156 if (pos == 0.0) 156 if (pos == 0.0)
157 evas_object_smart_callback_call 157 eo_do(obj, eo_event_callback_call
158 (obj, SIG_CHANGED, !elm_widget_mirrored_get(obj) ? "left" : "right"); 158 (ELM_ACTIONSLIDER_EVENT_POS_CHANGED,
159 !elm_widget_mirrored_get(obj) ? "left" : "right"));
159 else if (pos == 1.0) 160 else if (pos == 1.0)
160 evas_object_smart_callback_call 161 eo_do(obj, eo_event_callback_call
161 (obj, SIG_CHANGED, !elm_widget_mirrored_get(obj) ? "right" : "left"); 162 (ELM_ACTIONSLIDER_EVENT_POS_CHANGED,
163 !elm_widget_mirrored_get(obj) ? "right" : "left"));
162 else if (pos >= 0.45 && pos <= 0.55) 164 else if (pos >= 0.45 && pos <= 0.55)
163 evas_object_smart_callback_call(obj, SIG_CHANGED, "center"); 165 eo_do(obj, eo_event_callback_call
166 (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"));
164} 167}
165 168
166static void 169static void
@@ -230,13 +233,16 @@ _button_animator(void *data)
230 233
231 if ((!sd->final_position) && 234 if ((!sd->final_position) &&
232 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT)) 235 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
233 evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)left); 236 eo_do(obj, eo_event_callback_call
237 (ELM_ACTIONSLIDER_EVENT_SELECTED, (char *)left));
234 else if ((sd->final_position == 0.5) && 238 else if ((sd->final_position == 0.5) &&
235 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)) 239 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
236 evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)center); 240 eo_do(obj, eo_event_callback_call
241 (ELM_ACTIONSLIDER_EVENT_SELECTED, (char *)center));
237 else if ((sd->final_position == 1) && 242 else if ((sd->final_position == 1) &&
238 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) 243 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
239 evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)right); 244 eo_do(obj, eo_event_callback_call
245 (ELM_ACTIONSLIDER_EVENT_SELECTED, (char *)right));
240 246
241 sd->button_animator = NULL; 247 sd->button_animator = NULL;
242 248
@@ -273,7 +279,8 @@ _drag_button_up_cb(void *data,
273 (elm_widget_mirrored_get(obj) && position == 1.0))) 279 (elm_widget_mirrored_get(obj) && position == 1.0)))
274 { 280 {
275 sd->final_position = 0; 281 sd->final_position = 0;
276 evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)left); 282 eo_do(obj, eo_event_callback_call
283 (ELM_ACTIONSLIDER_EVENT_SELECTED, (char *)left));
277 284
278 return; 285 return;
279 } 286 }
@@ -282,7 +289,8 @@ _drag_button_up_cb(void *data,
282 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)) 289 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
283 { 290 {
284 sd->final_position = 0.5; 291 sd->final_position = 0.5;
285 evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)center); 292 eo_do(obj, eo_event_callback_call
293 (ELM_ACTIONSLIDER_EVENT_SELECTED, (char *)center));
286 294
287 ecore_animator_del(sd->button_animator); 295 ecore_animator_del(sd->button_animator);
288 sd->button_animator = ecore_animator_add(_button_animator, obj); 296 sd->button_animator = ecore_animator_add(_button_animator, obj);
@@ -295,7 +303,8 @@ _drag_button_up_cb(void *data,
295 (elm_widget_mirrored_get(obj) && position == 0.0))) 303 (elm_widget_mirrored_get(obj) && position == 0.0)))
296 { 304 {
297 sd->final_position = 1; 305 sd->final_position = 1;
298 evas_object_smart_callback_call(obj, SIG_SELECTED, (char *)right); 306 eo_do(obj, eo_event_callback_call
307 (ELM_ACTIONSLIDER_EVENT_SELECTED, (char *)right));
299 return; 308 return;
300 } 309 }
301 310
@@ -364,19 +373,22 @@ _track_move_cb(void *data,
364 { 373 {
365 if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER) 374 if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
366 { 375 {
367 evas_object_smart_callback_call(obj, SIG_CHANGED, "center"); 376 eo_do(obj, eo_event_callback_call
377 (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"));
368 sd->final_position = 0.5; 378 sd->final_position = 0.5;
369 } 379 }
370 else if (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT) 380 else if (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)
371 { 381 {
372 evas_object_smart_callback_call(obj, SIG_CHANGED, "right"); 382 eo_do(obj, eo_event_callback_call
383 (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right"));
373 sd->final_position = 1.0; 384 sd->final_position = 1.0;
374 } 385 }
375 } 386 }
376 else if ((sd->final_position == 0.5) && 387 else if ((sd->final_position == 0.5) &&
377 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) 388 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
378 { 389 {
379 evas_object_smart_callback_call(obj, SIG_CHANGED, "right"); 390 eo_do(obj, eo_event_callback_call
391 (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "right"));
380 sd->final_position = 1.0; 392 sd->final_position = 1.0;
381 } 393 }
382 } 394 }
@@ -384,7 +396,8 @@ _track_move_cb(void *data,
384 { 396 {
385 if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER) 397 if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
386 { 398 {
387 evas_object_smart_callback_call(obj, SIG_CHANGED, "center"); 399 eo_do(obj, eo_event_callback_call
400 (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"));
388 sd->final_position = 0.5; 401 sd->final_position = 0.5;
389 } 402 }
390 } 403 }
@@ -394,19 +407,22 @@ _track_move_cb(void *data,
394 { 407 {
395 if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER) 408 if (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)
396 { 409 {
397 evas_object_smart_callback_call(obj, SIG_CHANGED, "center"); 410 eo_do(obj, eo_event_callback_call
411 (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "center"));
398 sd->final_position = 0.5; 412 sd->final_position = 0.5;
399 } 413 }
400 else if (sd->enabled_position & ELM_ACTIONSLIDER_LEFT) 414 else if (sd->enabled_position & ELM_ACTIONSLIDER_LEFT)
401 { 415 {
402 evas_object_smart_callback_call(obj, SIG_CHANGED, "left"); 416 eo_do(obj, eo_event_callback_call
417 (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "left"));
403 sd->final_position = 0.0; 418 sd->final_position = 0.0;
404 } 419 }
405 } 420 }
406 else if (sd->final_position == 0.5 && 421 else if (sd->final_position == 0.5 &&
407 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT)) 422 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
408 { 423 {
409 evas_object_smart_callback_call(obj, SIG_CHANGED, "left"); 424 eo_do(obj, eo_event_callback_call
425 (ELM_ACTIONSLIDER_EVENT_POS_CHANGED, "left"));
410 sd->final_position = 0.0; 426 sd->final_position = 0.0;
411 } 427 }
412 } 428 }
diff --git a/src/lib/elm_actionslider.eo b/src/lib/elm_actionslider.eo
index 328a51bc3..f5f96b3c2 100644
--- a/src/lib/elm_actionslider.eo
+++ b/src/lib/elm_actionslider.eo
@@ -90,6 +90,8 @@ class Elm.Actionslider (Elm.Layout)
90 events { 90 events {
91 language,changed; 91 language,changed;
92 access,changed; 92 access,changed;
93 pos_changed;
94 selected;
93 } 95 }
94 96
95} 97}
diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c
index 511846a1d..b5a7c1f60 100644
--- a/src/lib/elm_map.c
+++ b/src/lib/elm_map.c
@@ -595,8 +595,8 @@ _loaded_timeout_cb(void *data)
595 595
596 sd->loaded_timer = NULL; 596 sd->loaded_timer = NULL;
597 if (!(sd->download_num) && !(sd->download_idler)) 597 if (!(sd->download_num) && !(sd->download_idler))
598 evas_object_smart_callback_call 598 eo_do(sd->obj, eo_event_callback_call
599 (sd->obj, SIG_LOADED, NULL); 599 (ELM_MAP_EVENT_LOADED, NULL));
600 return ECORE_CALLBACK_CANCEL; 600 return ECORE_CALLBACK_CANCEL;
601} 601}
602 602
@@ -747,8 +747,8 @@ _downloaded_cb(void *data,
747 747
748 _grid_item_update(gi); 748 _grid_item_update(gi);
749 gi->wsd->finish_num++; 749 gi->wsd->finish_num++;
750 evas_object_smart_callback_call 750 eo_do((gi->wsd)->obj, eo_event_callback_call
751 ((gi->wsd)->obj, SIG_TILE_LOADED, NULL); 751 (ELM_MAP_EVENT_TILE_LOADED, NULL));
752 } 752 }
753 else 753 else
754 { 754 {
@@ -756,8 +756,8 @@ _downloaded_cb(void *data,
756 756
757 ecore_file_remove(gi->file); 757 ecore_file_remove(gi->file);
758 gi->file_have = EINA_FALSE; 758 gi->file_have = EINA_FALSE;
759 evas_object_smart_callback_call 759 eo_do((gi->wsd)->obj, eo_event_callback_call
760 ((gi->wsd)->obj, SIG_TILE_LOADED_FAIL, NULL); 760 (ELM_MAP_EVENT_TILE_LOADED_FAIL, NULL));
761 } 761 }
762 762
763 ELM_WIDGET_DATA_GET_OR_RETURN(gi->wsd->obj, wd); 763 ELM_WIDGET_DATA_GET_OR_RETURN(gi->wsd->obj, wd);
@@ -805,8 +805,8 @@ _download_job(void *data)
805 sd->download_list = eina_list_remove(sd->download_list, gi); 805 sd->download_list = eina_list_remove(sd->download_list, gi);
806 sd->try_num++; 806 sd->try_num++;
807 sd->download_num++; 807 sd->download_num++;
808 evas_object_smart_callback_call 808 eo_do(obj, eo_event_callback_call
809 (obj, SIG_TILE_LOAD, NULL); 809 (ELM_MAP_EVENT_TILE_LOAD, NULL));
810 if (sd->download_num == 1) 810 if (sd->download_num == 1)
811 edje_object_signal_emit(wd->resize_obj, 811 edje_object_signal_emit(wd->resize_obj,
812 "elm,state,busy,start", "elm"); 812 "elm,state,busy,start", "elm");
@@ -1066,8 +1066,8 @@ _zoom_timeout_cb(void *data)
1066 1066
1067 _smooth_update(sd); 1067 _smooth_update(sd);
1068 sd->zoom_timer = NULL; 1068 sd->zoom_timer = NULL;
1069 evas_object_smart_callback_call 1069 eo_do(sd->obj, eo_event_callback_call
1070 (sd->obj, SIG_ZOOM_STOP, NULL); 1070 (ELM_MAP_EVENT_ZOOM_STOP, NULL));
1071 1071
1072 return ECORE_CALLBACK_CANCEL; 1072 return ECORE_CALLBACK_CANCEL;
1073} 1073}
@@ -1124,14 +1124,15 @@ _zoom_do(Elm_Map_Data *sd,
1124 1124
1125 if (sd->zoom_timer) ecore_timer_del(sd->zoom_timer); 1125 if (sd->zoom_timer) ecore_timer_del(sd->zoom_timer);
1126 else 1126 else
1127 evas_object_smart_callback_call 1127 eo_do(sd->obj, eo_event_callback_call
1128 (sd->obj, SIG_ZOOM_START, NULL); 1128 (ELM_MAP_EVENT_ZOOM_START, NULL));
1129 1129
1130 sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj); 1130 sd->zoom_timer = ecore_timer_add(0.25, _zoom_timeout_cb, sd->obj);
1131 evas_object_smart_callback_call 1131 eo_do(sd->obj, eo_event_callback_call
1132 (sd->obj, SIG_ZOOM_CHANGE, NULL); 1132 (ELM_MAP_EVENT_ZOOM_CHANGE, NULL));
1133 1133
1134 evas_object_smart_callback_call(sd->pan_obj, "changed", NULL); 1134 eo_do(sd->pan_obj, eo_event_callback_call
1135 (ELM_PAN_EVENT_CHANGED, NULL));
1135 evas_object_smart_changed(sd->pan_obj); 1136 evas_object_smart_changed(sd->pan_obj);
1136} 1137}
1137 1138
@@ -1267,8 +1268,8 @@ _scr_timeout_cb(void *data)
1267 1268
1268 _smooth_update(sd); 1269 _smooth_update(sd);
1269 sd->scr_timer = NULL; 1270 sd->scr_timer = NULL;
1270 evas_object_smart_callback_call 1271 eo_do(sd->obj, eo_event_callback_call
1271 (sd->obj, SIG_SCROLL_DRAG_STOP, NULL); 1272 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
1272 1273
1273 return ECORE_CALLBACK_CANCEL; 1274 return ECORE_CALLBACK_CANCEL;
1274} 1275}
@@ -1281,10 +1282,11 @@ _scroll_cb(Evas_Object *obj,
1281 1282
1282 if (sd->scr_timer) ecore_timer_del(sd->scr_timer); 1283 if (sd->scr_timer) ecore_timer_del(sd->scr_timer);
1283 else 1284 else
1284 evas_object_smart_callback_call 1285 eo_do(sd->obj, eo_event_callback_call
1285 (sd->obj, SIG_SCROLL_DRAG_START, NULL); 1286 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
1286 sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj); 1287 sd->scr_timer = ecore_timer_add(0.25, _scr_timeout_cb, obj);
1287 evas_object_smart_callback_call(sd->obj, SIG_SCROLL, NULL); 1288 eo_do(sd->obj, eo_event_callback_call
1289 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
1288} 1290}
1289 1291
1290static void 1292static void
@@ -1293,8 +1295,8 @@ _scroll_animate_start_cb(Evas_Object *obj,
1293{ 1295{
1294 ELM_MAP_DATA_GET(obj, sd); 1296 ELM_MAP_DATA_GET(obj, sd);
1295 1297
1296 evas_object_smart_callback_call 1298 eo_do(sd->obj, eo_event_callback_call
1297 (sd->obj, SIG_SCROLL_ANIM_START, NULL); 1299 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
1298} 1300}
1299 1301
1300static void 1302static void
@@ -1303,8 +1305,8 @@ _scroll_animate_stop_cb(Evas_Object *obj,
1303{ 1305{
1304 ELM_MAP_DATA_GET(obj, sd); 1306 ELM_MAP_DATA_GET(obj, sd);
1305 1307
1306 evas_object_smart_callback_call 1308 eo_do(sd->obj, eo_event_callback_call
1307 (sd->obj, SIG_SCROLL_ANIM_STOP, NULL); 1309 (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
1308} 1310}
1309 1311
1310static Eina_Bool 1312static Eina_Bool
@@ -1313,8 +1315,8 @@ _long_press_cb(void *data)
1313 ELM_MAP_DATA_GET(data, sd); 1315 ELM_MAP_DATA_GET(data, sd);
1314 1316
1315 sd->long_timer = NULL; 1317 sd->long_timer = NULL;
1316 evas_object_smart_callback_call 1318 eo_do(sd->obj, eo_event_callback_call
1317 (sd->obj, SIG_LONGPRESSED, &sd->ev); 1319 (ELM_MAP_EVENT_LONGPRESSED, &sd->ev));
1318 1320
1319 return ECORE_CALLBACK_CANCEL; 1321 return ECORE_CALLBACK_CANCEL;
1320} 1322}
@@ -1333,11 +1335,11 @@ _mouse_down_cb(void *data,
1333 else sd->on_hold = EINA_FALSE; 1335 else sd->on_hold = EINA_FALSE;
1334 1336
1335 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) 1337 if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK)
1336 evas_object_smart_callback_call 1338 eo_do(sd->obj, eo_event_callback_call
1337 (sd->obj, SIG_CLICKED_DOUBLE, ev); 1339 (ELM_MAP_EVENT_CLICKED_DOUBLE, ev));
1338 else 1340 else
1339 evas_object_smart_callback_call 1341 eo_do(sd->obj, eo_event_callback_call
1340 (sd->obj, SIG_PRESS, ev); 1342 (ELM_MAP_EVENT_PRESS, ev));
1341 1343
1342 ecore_timer_del(sd->long_timer); 1344 ecore_timer_del(sd->long_timer);
1343 sd->ev = *ev; 1345 sd->ev = *ev;
@@ -1364,8 +1366,8 @@ _mouse_up_cb(void *data,
1364 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del); 1366 ELM_SAFE_FREE(sd->long_timer, ecore_timer_del);
1365 1367
1366 if (!sd->on_hold) 1368 if (!sd->on_hold)
1367 evas_object_smart_callback_call 1369 eo_do(sd->obj, eo_event_callback_call
1368 (sd->obj, SIG_CLICKED, ev); 1370 (ELM_MAP_EVENT_CLICKED, ev));
1369 sd->on_hold = EINA_FALSE; 1371 sd->on_hold = EINA_FALSE;
1370} 1372}
1371 1373
@@ -1476,8 +1478,8 @@ _overlay_clicked_cb(void *data,
1476 1478
1477 EINA_SAFETY_ON_NULL_RETURN(data); 1479 EINA_SAFETY_ON_NULL_RETURN(data);
1478 1480
1479 evas_object_smart_callback_call 1481 eo_do((overlay->wsd)->obj, eo_event_callback_call
1480 ((overlay->wsd)->obj, SIG_OVERLAY_CLICKED, overlay); 1482 (ELM_MAP_EVENT_OVERLAY_CLICKED, overlay));
1481 if (overlay->cb) 1483 if (overlay->cb)
1482 overlay->cb(overlay->cb_data, (overlay->wsd)->obj, overlay); 1484 overlay->cb(overlay->cb_data, (overlay->wsd)->obj, overlay);
1483} 1485}
@@ -3058,15 +3060,15 @@ _route_cb(void *data,
3058 INF("Route request success from (%lf, %lf) to (%lf, %lf)", 3060 INF("Route request success from (%lf, %lf) to (%lf, %lf)",
3059 route->flon, route->flat, route->tlon, route->tlat); 3061 route->flon, route->flat, route->tlon, route->tlat);
3060 if (route->cb) route->cb(route->data, sd->obj, route); 3062 if (route->cb) route->cb(route->data, sd->obj, route);
3061 evas_object_smart_callback_call 3063 eo_do(sd->obj, eo_event_callback_call
3062 (sd->obj, SIG_ROUTE_LOADED, NULL); 3064 (ELM_MAP_EVENT_ROUTE_LOADED, NULL));
3063 } 3065 }
3064 else 3066 else
3065 { 3067 {
3066 ERR("Route request failed: %d", status); 3068 ERR("Route request failed: %d", status);
3067 if (route->cb) route->cb(route->data, sd->obj, NULL); 3069 if (route->cb) route->cb(route->data, sd->obj, NULL);
3068 evas_object_smart_callback_call 3070 eo_do(sd->obj, eo_event_callback_call
3069 (sd->obj, SIG_ROUTE_LOADED_FAIL, NULL); 3071 (ELM_MAP_EVENT_ROUTE_LOADED_FAIL, NULL));
3070 } 3072 }
3071 3073
3072 edje_object_signal_emit(wd->resize_obj, 3074 edje_object_signal_emit(wd->resize_obj,
@@ -3095,15 +3097,15 @@ _name_cb(void *data,
3095 INF("Name request success address:%s, lon:%lf, lat:%lf", 3097 INF("Name request success address:%s, lon:%lf, lat:%lf",
3096 name->address, name->lon, name->lat); 3098 name->address, name->lon, name->lat);
3097 if (name->cb) name->cb(name->data, sd->obj, name); 3099 if (name->cb) name->cb(name->data, sd->obj, name);
3098 evas_object_smart_callback_call 3100 eo_do(sd->obj, eo_event_callback_call
3099 (sd->obj, SIG_NAME_LOADED, NULL); 3101 (ELM_MAP_EVENT_NAME_LOADED, NULL));
3100 } 3102 }
3101 else 3103 else
3102 { 3104 {
3103 ERR("Name request failed: %d", status); 3105 ERR("Name request failed: %d", status);
3104 if (name->cb) name->cb(name->data, sd->obj, NULL); 3106 if (name->cb) name->cb(name->data, sd->obj, NULL);
3105 evas_object_smart_callback_call 3107 eo_do(sd->obj, eo_event_callback_call
3106 (sd->obj, SIG_NAME_LOADED_FAIL, NULL); 3108 (ELM_MAP_EVENT_NAME_LOADED_FAIL, NULL));
3107 } 3109 }
3108 edje_object_signal_emit(wd->resize_obj, 3110 edje_object_signal_emit(wd->resize_obj,
3109 "elm,state,busy,stop", "elm"); 3111 "elm,state,busy,stop", "elm");
@@ -3132,16 +3134,16 @@ _name_list_cb(void *data,
3132 if (name_list->cb) 3134 if (name_list->cb)
3133 name_list->cb(name_list->data, wd->obj, 3135 name_list->cb(name_list->data, wd->obj,
3134 name_list->names); 3136 name_list->names);
3135 evas_object_smart_callback_call 3137 eo_do(wd->obj, eo_event_callback_call
3136 (wd->obj, SIG_NAME_LOADED, NULL); 3138 (ELM_MAP_EVENT_NAME_LOADED, NULL));
3137 } 3139 }
3138 else 3140 else
3139 { 3141 {
3140 ERR("Name List request failed: %d", status); 3142 ERR("Name List request failed: %d", status);
3141 if (name_list->cb) 3143 if (name_list->cb)
3142 name_list->cb(name_list->data, wd->obj, NULL); 3144 name_list->cb(name_list->data, wd->obj, NULL);
3143 evas_object_smart_callback_call 3145 eo_do(wd->obj, eo_event_callback_call
3144 (wd->obj, SIG_NAME_LOADED_FAIL, NULL); 3146 (ELM_MAP_EVENT_NAME_LOADED_FAIL, NULL));
3145 } 3147 }
3146 3148
3147 edje_object_signal_emit(wd->resize_obj, 3149 edje_object_signal_emit(wd->resize_obj,
@@ -3218,8 +3220,8 @@ _name_request(const Evas_Object *obj,
3218 free(fname); 3220 free(fname);
3219 3221
3220 sd->names = eina_list_append(sd->names, name); 3222 sd->names = eina_list_append(sd->names, name);
3221 evas_object_smart_callback_call 3223 eo_do(sd->obj, eo_event_callback_call
3222 (sd->obj, SIG_NAME_LOAD, name); 3224 (ELM_MAP_EVENT_NAME_LOAD, name));
3223 edje_object_signal_emit(wd->resize_obj, 3225 edje_object_signal_emit(wd->resize_obj,
3224 "elm,state,busy,start", "elm"); 3226 "elm,state,busy,start", "elm");
3225 return name; 3227 return name;
@@ -3272,8 +3274,8 @@ _name_list_request(const Evas_Object *obj,
3272 free(url); 3274 free(url);
3273 free(fname); 3275 free(fname);
3274 3276
3275 evas_object_smart_callback_call 3277 eo_do(wd->obj, eo_event_callback_call
3276 (wd->obj, SIG_NAME_LOAD, name_list->names); 3278 (ELM_MAP_EVENT_NAME_LOAD, name_list->names));
3277 edje_object_signal_emit(wd->resize_obj, 3279 edje_object_signal_emit(wd->resize_obj,
3278 "elm,state,busy,start", "elm"); 3280 "elm,state,busy,start", "elm");
3279 return name_list->names; 3281 return name_list->names;
@@ -4539,8 +4541,8 @@ _elm_map_route_add(Eo *obj, Elm_Map_Data *sd, Elm_Map_Route_Type type, Elm_Map_R
4539 free(url); 4541 free(url);
4540 4542
4541 sd->routes = eina_list_append(sd->routes, route); 4543 sd->routes = eina_list_append(sd->routes, route);
4542 evas_object_smart_callback_call 4544 eo_do(sd->obj, eo_event_callback_call
4543 (sd->obj, SIG_ROUTE_LOAD, route); 4545 (ELM_MAP_EVENT_ROUTE_LOAD, route));
4544 edje_object_signal_emit(wd->resize_obj, 4546 edje_object_signal_emit(wd->resize_obj,
4545 "elm,state,busy,start", "elm"); 4547 "elm,state,busy,start", "elm");
4546 ret = route; 4548 ret = route;
@@ -4708,8 +4710,8 @@ elm_map_overlay_del(Elm_Map_Overlay *overlay)
4708 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd); 4710 EINA_SAFETY_ON_NULL_RETURN(overlay->wsd);
4709 ELM_MAP_CHECK((overlay->wsd)->obj); 4711 ELM_MAP_CHECK((overlay->wsd)->obj);
4710 4712
4711 evas_object_smart_callback_call 4713 eo_do((overlay->wsd)->obj, eo_event_callback_call
4712 ((overlay->wsd)->obj, SIG_OVERLAY_DEL, overlay); 4714 (ELM_MAP_EVENT_OVERLAY_DEL, overlay));
4713 if (overlay->del_cb) 4715 if (overlay->del_cb)
4714 overlay->del_cb 4716 overlay->del_cb
4715 (overlay->del_cb_data, (overlay->wsd)->obj, overlay); 4717 (overlay->del_cb_data, (overlay->wsd)->obj, overlay);
diff --git a/src/lib/elm_map.eo b/src/lib/elm_map.eo
index 4773971cb..45b21747a 100644
--- a/src/lib/elm_map.eo
+++ b/src/lib/elm_map.eo
@@ -790,11 +790,6 @@ class Elm.Map (Elm.Widget, Elm_Interface_Scrollable,
790 clicked,double; 790 clicked,double;
791 press; 791 press;
792 longpressed; 792 longpressed;
793 scroll;
794 scroll,drag,start;
795 scroll,drag,stop;
796 scroll,anim,start;
797 scroll,anim,stop;
798 zoom,start; 793 zoom,start;
799 zoom,stop; 794 zoom,stop;
800 zoom,change; 795 zoom,change;