summaryrefslogtreecommitdiff
path: root/src/lib/elementary
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-06-20 15:31:31 +0100
committerTom Hacohen <tom@stosb.com>2016-06-20 18:02:00 +0100
commit6202cc7485a54dea6f02a2668e7c907247902dd1 (patch)
tree7a1fa2b61175b1ef75a9bff7299a0ce3daa45216 /src/lib/elementary
parentd648eb5311585f7392d0290640ba133814b52589 (diff)
Adjust the code according to the eo event stop changes.
This was changed in the previous commit.
Diffstat (limited to 'src/lib/elementary')
-rw-r--r--src/lib/elementary/efl_ui_box.c8
-rw-r--r--src/lib/elementary/efl_ui_grid.c6
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c32
-rw-r--r--src/lib/elementary/efl_ui_win.c37
-rw-r--r--src/lib/elementary/elc_combobox.c31
-rw-r--r--src/lib/elementary/elc_fileselector.c126
-rw-r--r--src/lib/elementary/elc_fileselector_button.c8
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c14
-rw-r--r--src/lib/elementary/elc_hoversel.c28
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c36
-rw-r--r--src/lib/elementary/elc_naviframe.c9
-rw-r--r--src/lib/elementary/elc_player.c101
-rw-r--r--src/lib/elementary/elc_popup.c29
-rw-r--r--src/lib/elementary/elm_app_server.c3
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c166
-rw-r--r--src/lib/elementary/elm_box.c18
-rw-r--r--src/lib/elementary/elm_cnp.c3
-rw-r--r--src/lib/elementary/elm_code_widget.c13
-rw-r--r--src/lib/elementary/elm_color_class.c18
-rw-r--r--src/lib/elementary/elm_colorselector.c16
-rw-r--r--src/lib/elementary/elm_conform.c20
-rw-r--r--src/lib/elementary/elm_dayselector.c4
-rw-r--r--src/lib/elementary/elm_entry.c17
-rw-r--r--src/lib/elementary/elm_frame.c4
-rw-r--r--src/lib/elementary/elm_genlist.c4
-rw-r--r--src/lib/elementary/elm_glview.c13
-rw-r--r--src/lib/elementary/elm_helper.c5
-rw-r--r--src/lib/elementary/elm_helper.h2
-rw-r--r--src/lib/elementary/elm_interface_atspi_accessible.c3
-rw-r--r--src/lib/elementary/elm_interface_atspi_image.c4
-rw-r--r--src/lib/elementary/elm_interface_scrollable.c54
-rw-r--r--src/lib/elementary/elm_map.c7
-rw-r--r--src/lib/elementary/elm_menu.c12
-rw-r--r--src/lib/elementary/elm_panel.c4
-rw-r--r--src/lib/elementary/elm_photo.c4
-rw-r--r--src/lib/elementary/elm_photocam.c13
-rw-r--r--src/lib/elementary/elm_spinner.c32
-rw-r--r--src/lib/elementary/elm_store.c10
-rw-r--r--src/lib/elementary/elm_video.c36
-rw-r--r--src/lib/elementary/elm_view_form.c10
-rw-r--r--src/lib/elementary/elm_view_list.c40
-rw-r--r--src/lib/elementary/elm_widget.c41
43 files changed, 390 insertions, 655 deletions
diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 0291dd7c3f..6efefa294c 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -23,26 +23,22 @@ _efl_ui_box_list_data_get(const Eina_List *list)
23 return opt->obj; 23 return opt->obj;
24} 24}
25 25
26static Eina_Bool 26static void
27_child_added_cb_proxy(void *data, const Eo_Event *event) 27_child_added_cb_proxy(void *data, const Eo_Event *event)
28{ 28{
29 Evas_Object *box = data; 29 Evas_Object *box = data;
30 Evas_Object_Box_Option *opt = event->info; 30 Evas_Object_Box_Option *opt = event->info;
31 31
32 eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj); 32 eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_ADDED, opt->obj);
33
34 return EINA_TRUE;
35} 33}
36 34
37static Eina_Bool 35static void
38_child_removed_cb_proxy(void *data, const Eo_Event *event) 36_child_removed_cb_proxy(void *data, const Eo_Event *event)
39{ 37{
40 Evas_Object *box = data; 38 Evas_Object *box = data;
41 Evas_Object *child = event->info; 39 Evas_Object *child = event->info;
42 40
43 eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child); 41 eo_event_callback_call(box, EFL_CONTAINER_EVENT_CONTENT_REMOVED, child);
44
45 return EINA_TRUE;
46} 42}
47 43
48EOLIAN static Eina_Bool 44EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 7073964ab9..8f544c48a3 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -7,7 +7,7 @@
7 7
8typedef struct _Custom_Table_Data Custom_Table_Data; 8typedef struct _Custom_Table_Data Custom_Table_Data;
9 9
10static Eina_Bool _subobj_del_cb(void *data, const Eo_Event *event); 10static void _subobj_del_cb(void *data, const Eo_Event *event);
11static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj); 11static void _item_remove(Efl_Ui_Grid *obj, Efl_Ui_Grid_Data *pd, Efl_Gfx *subobj);
12 12
13struct _Custom_Table_Data 13struct _Custom_Table_Data
@@ -336,7 +336,7 @@ _efl_ui_grid_efl_pack_pack_padding_get(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED
336 if (v) *v = pd->pad.v; 336 if (v) *v = pd->pad.v;
337} 337}
338 338
339static Eina_Bool 339static void
340_subobj_del_cb(void *data, const Eo_Event *event) 340_subobj_del_cb(void *data, const Eo_Event *event)
341{ 341{
342 Efl_Ui_Grid *obj = data; 342 Efl_Ui_Grid *obj = data;
@@ -347,8 +347,6 @@ _subobj_del_cb(void *data, const Eo_Event *event)
347 347
348 if (!elm_widget_sub_object_del(obj, event->object)) 348 if (!elm_widget_sub_object_del(obj, event->object))
349 WRN("failed to remove child from its parent"); 349 WRN("failed to remove child from its parent");
350
351 return EO_CALLBACK_CONTINUE;
352} 350}
353 351
354static Eina_Bool 352static Eina_Bool
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 514c53c2fb..0286727f88 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -500,14 +500,12 @@ _entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, Efl_Ui_Internal_Text
500 return en->selection; 500 return en->selection;
501} 501}
502 502
503static Eina_Bool 503static void
504_sel_cursor_changed(void *data, const Eo_Event *event EINA_UNUSED) 504_sel_cursor_changed(void *data, const Eo_Event *event EINA_UNUSED)
505{ 505{
506 Efl_Canvas_Text_Cursor *obj = data; 506 Efl_Canvas_Text_Cursor *obj = data;
507 507
508 eo_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL); 508 eo_event_callback_call(obj, EFL_UI_TEXT_INTERACTIVE_EVENT_SELECTION_CHANGED, NULL);
509
510 return EO_CALLBACK_CONTINUE;
511} 509}
512 510
513static void 511static void
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 514961f8a8..7473281a5c 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -228,9 +228,9 @@ static void _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd);
228static void _magnifier_move(void *data); 228static void _magnifier_move(void *data);
229static void _update_decorations(Eo *obj); 229static void _update_decorations(Eo *obj);
230static void _create_text_cursors(Efl_Ui_Text_Data *sd); 230static void _create_text_cursors(Efl_Ui_Text_Data *sd);
231static Eina_Bool _efl_ui_text_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); 231static void _efl_ui_text_changed_cb(void *data EINA_UNUSED, const Eo_Event *event);
232static Eina_Bool _efl_ui_text_selection_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); 232static void _efl_ui_text_selection_changed_cb(void *data EINA_UNUSED, const Eo_Event *event);
233static Eina_Bool _efl_ui_text_cursor_changed_cb(void *data EINA_UNUSED, const Eo_Event *event); 233static void _efl_ui_text_cursor_changed_cb(void *data EINA_UNUSED, const Eo_Event *event);
234static void _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); 234static void _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
235static void _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd); 235static void _efl_ui_text_select_none(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd);
236static void _efl_ui_text_select_all(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd); 236static void _efl_ui_text_select_all(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd);
@@ -458,7 +458,7 @@ _validate(Evas_Object *obj)
458 vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text"); 458 vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text");
459 res = eo_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc); 459 res = eo_event_callback_call(obj, EFL_UI_TEXT_EVENT_VALIDATE, (void *)&vc);
460 buf = eina_strbuf_new(); 460 buf = eina_strbuf_new();
461 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EO_CALLBACK_STOP ? "fail" : "pass"); 461 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass");
462 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm"); 462 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm");
463 eina_tmpstr_del(vc.signal); 463 eina_tmpstr_del(vc.signal);
464 eina_strbuf_free(buf); 464 eina_strbuf_free(buf);
@@ -1478,7 +1478,7 @@ _hover_del_job(void *data)
1478 sd->hov_deljob = NULL; 1478 sd->hov_deljob = NULL;
1479} 1479}
1480 1480
1481static Eina_Bool 1481static void
1482_hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED) 1482_hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED)
1483{ 1483{
1484 EFL_UI_TEXT_DATA_GET(data, sd); 1484 EFL_UI_TEXT_DATA_GET(data, sd);
@@ -1497,8 +1497,6 @@ _hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED)
1497 elm_widget_scroll_freeze_pop(data); 1497 elm_widget_scroll_freeze_pop(data);
1498 ecore_job_del(sd->hov_deljob); 1498 ecore_job_del(sd->hov_deljob);
1499 sd->hov_deljob = ecore_job_add(_hover_del_job, data); 1499 sd->hov_deljob = ecore_job_add(_hover_del_job, data);
1500
1501 return EINA_TRUE;
1502} 1500}
1503 1501
1504static void 1502static void
@@ -2629,13 +2627,11 @@ _anchor_hover_del_cb(void *data,
2629 (sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj); 2627 (sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj);
2630} 2628}
2631 2629
2632static Eina_Bool 2630static void
2633_anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 2631_anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
2634{ 2632{
2635 EFL_UI_TEXT_DATA_GET(data, sd); 2633 EFL_UI_TEXT_DATA_GET(data, sd);
2636 _efl_ui_text_anchor_hover_end(data, sd); 2634 _efl_ui_text_anchor_hover_end(data, sd);
2637
2638 return EINA_TRUE;
2639} 2635}
2640 2636
2641static void 2637static void
@@ -4059,7 +4055,7 @@ _efl_ui_text_elm_layout_theme_enable(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd E
4059 return EINA_FALSE; 4055 return EINA_FALSE;
4060} 4056}
4061 4057
4062static Eina_Bool 4058static void
4063_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) 4059_cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
4064{ 4060{
4065 const Eo_Callback_Array_Item *event = ev->info; 4061 const Eo_Callback_Array_Item *event = ev->info;
@@ -4067,10 +4063,9 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
4067 EFL_UI_TEXT_DATA_GET(ev->object, sd); 4063 EFL_UI_TEXT_DATA_GET(ev->object, sd);
4068 if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE) 4064 if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE)
4069 sd->validators++; 4065 sd->validators++;
4070 return EO_CALLBACK_CONTINUE;
4071} 4066}
4072 4067
4073static Eina_Bool 4068static void
4074_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) 4069_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
4075{ 4070{
4076 const Eo_Callback_Array_Item *event = ev->info; 4071 const Eo_Callback_Array_Item *event = ev->info;
@@ -4078,7 +4073,7 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
4078 EFL_UI_TEXT_DATA_GET(ev->object, sd); 4073 EFL_UI_TEXT_DATA_GET(ev->object, sd);
4079 if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE) 4074 if (event->desc == EFL_UI_TEXT_EVENT_VALIDATE)
4080 sd->validators--; 4075 sd->validators--;
4081 return EO_CALLBACK_CONTINUE; 4076 return;
4082 4077
4083} 4078}
4084 4079
@@ -5604,25 +5599,22 @@ _update_decorations(Eo *obj)
5604 _update_text_selection(obj, text_obj); 5599 _update_text_selection(obj, text_obj);
5605} 5600}
5606 5601
5607static Eina_Bool 5602static void
5608_efl_ui_text_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 5603_efl_ui_text_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
5609{ 5604{
5610 _update_decorations(data); 5605 _update_decorations(data);
5611 return EINA_TRUE;
5612} 5606}
5613 5607
5614static Eina_Bool 5608static void
5615_efl_ui_text_cursor_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 5609_efl_ui_text_cursor_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
5616{ 5610{
5617 _update_text_cursors(data); 5611 _update_text_cursors(data);
5618 return EINA_TRUE;
5619} 5612}
5620 5613
5621static Eina_Bool 5614static void
5622_efl_ui_text_selection_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 5615_efl_ui_text_selection_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
5623{ 5616{
5624 _update_text_selection(data, event->object); 5617 _update_text_selection(data, event->object);
5625 return EINA_TRUE;
5626} 5618}
5627 5619
5628static void 5620static void
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 595f852fe3..f5a0280d95 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1658,7 +1658,7 @@ _efl_ui_win_elm_widget_event(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Evas_Obj
1658} 1658}
1659 1659
1660/* forward events sent to evas to the window */ 1660/* forward events sent to evas to the window */
1661static Eina_Bool 1661static void
1662_evas_event_key_cb(void *data, const Eo_Event *ev) 1662_evas_event_key_cb(void *data, const Eo_Event *ev)
1663{ 1663{
1664 Eo *win = data; 1664 Eo *win = data;
@@ -1667,17 +1667,16 @@ _evas_event_key_cb(void *data, const Eo_Event *ev)
1667 1667
1668 evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 1668 evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
1669 if (!evdata || evdata->win_fed) 1669 if (!evdata || evdata->win_fed)
1670 return EO_CALLBACK_CONTINUE; 1670 return;
1671 1671
1672 // evas_callbacks will send the event to the focussed object (ie. this win) 1672 // evas_callbacks will send the event to the focussed object (ie. this win)
1673 if (evas_focus_get(evas_object_evas_get(win)) == win) 1673 if (evas_focus_get(evas_object_evas_get(win)) == win)
1674 return EO_CALLBACK_CONTINUE; 1674 return;
1675 1675
1676 eo_event_callback_call(win, ev->desc, evt); 1676 eo_event_callback_call(win, ev->desc, evt);
1677 return EO_CALLBACK_CONTINUE;
1678} 1677}
1679 1678
1680static Eina_Bool 1679static void
1681_evas_event_pointer_cb(void *data, const Eo_Event *ev) 1680_evas_event_pointer_cb(void *data, const Eo_Event *ev)
1682{ 1681{
1683 Eo *win = data; 1682 Eo *win = data;
@@ -1686,14 +1685,13 @@ _evas_event_pointer_cb(void *data, const Eo_Event *ev)
1686 1685
1687 evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1686 evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
1688 if (!evdata || evdata->win_fed) 1687 if (!evdata || evdata->win_fed)
1689 return EO_CALLBACK_CONTINUE; 1688 return;
1690 1689
1691 eo_event_callback_call(win, ev->desc, evt); 1690 eo_event_callback_call(win, ev->desc, evt);
1692 return EO_CALLBACK_CONTINUE;
1693} 1691}
1694 1692
1695/* feed events from the window to evas - for fake inputs */ 1693/* feed events from the window to evas - for fake inputs */
1696static Eina_Bool 1694static void
1697_evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev) 1695_evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev)
1698{ 1696{
1699 Eo *evas = data; 1697 Eo *evas = data;
@@ -1701,20 +1699,19 @@ _evas_event_key_feed_fake_cb(void *data, const Eo_Event *ev)
1701 Efl_Event_Key_Data *evdata; 1699 Efl_Event_Key_Data *evdata;
1702 1700
1703 if (!efl_event_fake_get(evt)) 1701 if (!efl_event_fake_get(evt))
1704 return EO_CALLBACK_CONTINUE; 1702 return;
1705 1703
1706 evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS); 1704 evdata = eo_data_scope_get(evt, EFL_EVENT_KEY_CLASS);
1707 if (!evdata || evdata->win_fed) 1705 if (!evdata || evdata->win_fed)
1708 return EO_CALLBACK_CONTINUE; 1706 return;
1709 evdata->win_fed = EINA_TRUE; 1707 evdata->win_fed = EINA_TRUE;
1710 1708
1711 eo_event_callback_call(evas, ev->desc, evt); 1709 eo_event_callback_call(evas, ev->desc, evt);
1712 evdata->win_fed = EINA_FALSE; 1710 evdata->win_fed = EINA_FALSE;
1713 evdata->evas_done = EINA_FALSE; 1711 evdata->evas_done = EINA_FALSE;
1714 return EO_CALLBACK_CONTINUE;
1715} 1712}
1716 1713
1717static Eina_Bool 1714static void
1718_evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev) 1715_evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
1719{ 1716{
1720 Eo *evas = data; 1717 Eo *evas = data;
@@ -1722,17 +1719,16 @@ _evas_event_pointer_feed_fake_cb(void *data, const Eo_Event *ev)
1722 Efl_Event_Pointer_Data *evdata; 1719 Efl_Event_Pointer_Data *evdata;
1723 1720
1724 if (!efl_event_fake_get(evt)) 1721 if (!efl_event_fake_get(evt))
1725 return EO_CALLBACK_CONTINUE; 1722 return;
1726 1723
1727 evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS); 1724 evdata = eo_data_scope_get(evt, EFL_EVENT_POINTER_CLASS);
1728 if (!evdata || evdata->win_fed) 1725 if (!evdata || evdata->win_fed)
1729 return EO_CALLBACK_CONTINUE; 1726 return;
1730 evdata->win_fed = EINA_TRUE; 1727 evdata->win_fed = EINA_TRUE;
1731 1728
1732 eo_event_callback_call(evas, ev->desc, evt); 1729 eo_event_callback_call(evas, ev->desc, evt);
1733 evdata->win_fed = EINA_FALSE; 1730 evdata->win_fed = EINA_FALSE;
1734 evdata->evas_done = EINA_FALSE; 1731 evdata->evas_done = EINA_FALSE;
1735 return EO_CALLBACK_CONTINUE;
1736} 1732}
1737 1733
1738EO_CALLBACKS_ARRAY_DEFINE(_elm_win_evas_feed_fake_callbacks, 1734EO_CALLBACKS_ARRAY_DEFINE(_elm_win_evas_feed_fake_callbacks,
@@ -1830,7 +1826,7 @@ _elm_win_evas_device_changed(void *data,
1830 eo_event_callback_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device); 1826 eo_event_callback_call(win, EFL_CANVAS_EVENT_DEVICE_CHANGED, device);
1831} 1827}
1832 1828
1833static Eina_Bool 1829static void
1834_win_event_add_cb(void *data, const Eo_Event *ev) 1830_win_event_add_cb(void *data, const Eo_Event *ev)
1835{ 1831{
1836 const Eo_Callback_Array_Item *array = ev->info; 1832 const Eo_Callback_Array_Item *array = ev->info;
@@ -1937,11 +1933,9 @@ _win_event_add_cb(void *data, const Eo_Event *ev)
1937 _elm_win_evas_device_changed, win); 1933 _elm_win_evas_device_changed, win);
1938 } 1934 }
1939 } 1935 }
1940
1941 return EO_CALLBACK_CONTINUE;
1942} 1936}
1943 1937
1944static Eina_Bool 1938static void
1945_win_event_del_cb(void *data, const Eo_Event *ev) 1939_win_event_del_cb(void *data, const Eo_Event *ev)
1946{ 1940{
1947 const Eo_Callback_Array_Item *array = ev->info; 1941 const Eo_Callback_Array_Item *array = ev->info;
@@ -2048,8 +2042,6 @@ _win_event_del_cb(void *data, const Eo_Event *ev)
2048 _elm_win_evas_device_changed, win); 2042 _elm_win_evas_device_changed, win);
2049 } 2043 }
2050 } 2044 }
2051
2052 return EO_CALLBACK_CONTINUE;
2053} 2045}
2054 2046
2055static void 2047static void
@@ -5720,7 +5712,7 @@ _elm_win_focus_auto_hide(Evas_Object *obj)
5720 } 5712 }
5721} 5713}
5722 5714
5723static Eina_Bool 5715static void
5724_on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 5716_on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
5725{ 5717{
5726 Evas_Object *win; 5718 Evas_Object *win;
@@ -5749,7 +5741,6 @@ _on_atspi_bus_connected(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSE
5749 else 5741 else
5750 elm_interface_atspi_window_deactivated_signal_emit(win); 5742 elm_interface_atspi_window_deactivated_signal_emit(win);
5751 } 5743 }
5752 return EINA_TRUE;
5753} 5744}
5754 5745
5755EOLIAN static void 5746EOLIAN static void
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 04fb81d404..f9e3d76d7c 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -90,7 +90,7 @@ _elm_combobox_elm_widget_theme_apply(Eo *obj, Elm_Combobox_Data *sd)
90 return EINA_TRUE; 90 return EINA_TRUE;
91} 91}
92 92
93static Eina_Bool 93static void
94_on_hover_clicked(void *data, const Eo_Event *event) 94_on_hover_clicked(void *data, const Eo_Event *event)
95{ 95{
96 const char *dismissstr; 96 const char *dismissstr;
@@ -99,8 +99,6 @@ _on_hover_clicked(void *data, const Eo_Event *event)
99 99
100 if (!dismissstr || strcmp(dismissstr, "on")) 100 if (!dismissstr || strcmp(dismissstr, "on"))
101 elm_combobox_hover_end(data); // for backward compatibility 101 elm_combobox_hover_end(data); // for backward compatibility
102
103 return EINA_TRUE;
104} 102}
105 103
106static void 104static void
@@ -213,7 +211,7 @@ _on_item_pressed(void *data , Evas_Object *obj EINA_UNUSED, void *event)
213 eo_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event); 211 eo_event_callback_call(data, ELM_COMBOBOX_EVENT_ITEM_PRESSED, event);
214} 212}
215 213
216static Eina_Bool 214static void
217_gl_filter_finished_cb(void *data, const Eo_Event *event) 215_gl_filter_finished_cb(void *data, const Eo_Event *event)
218{ 216{
219 char buf[1024]; 217 char buf[1024];
@@ -224,7 +222,7 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event)
224 if (sd->first_filter) 222 if (sd->first_filter)
225 { 223 {
226 sd->first_filter = EINA_FALSE; 224 sd->first_filter = EINA_FALSE;
227 return EINA_TRUE; 225 return;
228 } 226 }
229 227
230 eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info); 228 eo_event_callback_call(data, ELM_COMBOBOX_EVENT_FILTER_DONE, event->info);
@@ -243,30 +241,25 @@ _gl_filter_finished_cb(void *data, const Eo_Event *event)
243 elm_layout_signal_emit(sd->hover, buf, "elm"); 241 elm_layout_signal_emit(sd->hover, buf, "elm");
244 edje_object_message_signal_process(elm_layout_edje_get(sd->hover)); 242 edje_object_message_signal_process(elm_layout_edje_get(sd->hover));
245 } 243 }
246
247 return EINA_TRUE;
248} 244}
249 245
250static Eina_Bool 246static void
251_on_aborted(void *data, const Eo_Event *event EINA_UNUSED) 247_on_aborted(void *data, const Eo_Event *event EINA_UNUSED)
252{ 248{
253 ELM_COMBOBOX_DATA_GET(data, sd); 249 ELM_COMBOBOX_DATA_GET(data, sd);
254 if (sd->expanded) elm_combobox_hover_end(data); 250 if (sd->expanded) elm_combobox_hover_end(data);
255 return EINA_TRUE;
256} 251}
257 252
258static Eina_Bool 253static void
259_on_changed(void *data, const Eo_Event *event EINA_UNUSED) 254_on_changed(void *data, const Eo_Event *event EINA_UNUSED)
260{ 255{
261 eo_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED, NULL); 256 eo_event_callback_call(data, ELM_ENTRY_EVENT_CHANGED, NULL);
262 return EINA_TRUE;
263} 257}
264 258
265static Eina_Bool 259static void
266_on_clicked(void *data, const Eo_Event *event EINA_UNUSED) 260_on_clicked(void *data, const Eo_Event *event EINA_UNUSED)
267{ 261{
268 elm_combobox_hover_begin(data); 262 elm_combobox_hover_begin(data);
269 return EINA_TRUE;
270} 263}
271 264
272EOLIAN static void 265EOLIAN static void
@@ -317,34 +310,30 @@ _elm_combobox_multiple_selection_get(Eo *obj EINA_UNUSED, Elm_Combobox_Data *pd)
317 return pd->multiple_selection; 310 return pd->multiple_selection;
318} 311}
319 312
320static Eina_Bool 313static void
321_mbe_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event) 314_mbe_clicked_cb(void *data EINA_UNUSED, const Eo_Event *event)
322{ 315{
323 //Unset the multibuttonentry to contracted mode of single line 316 //Unset the multibuttonentry to contracted mode of single line
324 elm_multibuttonentry_expanded_set(event->object, EINA_TRUE); 317 elm_multibuttonentry_expanded_set(event->object, EINA_TRUE);
325 return EINA_TRUE;
326} 318}
327 319
328static Eina_Bool 320static void
329_mbe_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 321_mbe_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
330{ 322{
331 return EINA_TRUE;
332} 323}
333 324
334static Eina_Bool 325static void
335_mbe_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event) 326_mbe_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event)
336{ 327{
337 //Set the multibuttonentry to contracted mode of single line 328 //Set the multibuttonentry to contracted mode of single line
338 elm_multibuttonentry_expanded_set(event->object, EINA_FALSE); 329 elm_multibuttonentry_expanded_set(event->object, EINA_FALSE);
339 return EINA_TRUE;
340} 330}
341 331
342static Eina_Bool 332static void
343_mbe_item_added(void *data, const Eo_Event *event EINA_UNUSED) 333_mbe_item_added(void *data, const Eo_Event *event EINA_UNUSED)
344{ 334{
345 ELM_COMBOBOX_DATA_GET(data, sd); 335 ELM_COMBOBOX_DATA_GET(data, sd);
346 elm_genlist_filter_set(sd->genlist, NULL); 336 elm_genlist_filter_set(sd->genlist, NULL);
347 return EINA_TRUE;
348} 337}
349 338
350EO_CALLBACKS_ARRAY_DEFINE(mbe_callbacks, 339EO_CALLBACKS_ARRAY_DEFINE(mbe_callbacks,
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index d3053a7dc6..34bce99378 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -56,14 +56,14 @@ static const Elm_Action key_actions[] = {
56 {NULL, NULL} 56 {NULL, NULL}
57}; 57};
58 58
59static Eina_Bool _ok(void *data, const Eo_Event *event); 59static void _ok(void *data, const Eo_Event *event);
60static Eina_Bool _canc(void *data, const Eo_Event *event); 60static void _canc(void *data, const Eo_Event *event);
61static Eina_Bool _on_dir_up(void *data, const Eo_Event *event); 61static void _on_dir_up(void *data, const Eo_Event *event);
62static void _populate(Evas_Object *obj, Efl_Model *model, Elm_Object_Item *parent_it, Efl_Model *selected); 62static void _populate(Evas_Object *obj, Efl_Model *model, Elm_Object_Item *parent_it, Efl_Model *selected);
63static Elm_Fileselector_Item_Data *_selected_item_data_get(Elm_Fileselector_Data *sd); 63static Elm_Fileselector_Item_Data *_selected_item_data_get(Elm_Fileselector_Data *sd);
64 64
65static Eina_Bool _resource_created(void *, const Eo_Event *); 65static void _resource_created(void *, const Eo_Event *);
66static Eina_Bool _resource_deleted(void *, const Eo_Event *); 66static void _resource_deleted(void *, const Eo_Event *);
67static void _listing_request_cleanup(Listing_Request *); 67static void _listing_request_cleanup(Listing_Request *);
68 68
69static void 69static void
@@ -954,45 +954,37 @@ _populate(Evas_Object *obj,
954 eina_promise_then(promise_all, _process_children_cb, _process_children_error_cb, lreq); 954 eina_promise_then(promise_all, _process_children_cb, _process_children_error_cb, lreq);
955} 955}
956 956
957static Eina_Bool 957static void
958_on_list_expanded(void *data, const Eo_Event *event) 958_on_list_expanded(void *data, const Eo_Event *event)
959{ 959{
960 Elm_Object_Item *it = event->info; 960 Elm_Object_Item *it = event->info;
961 const Elm_Fileselector_Item_Data *it_data = elm_object_item_data_get(it); 961 const Elm_Fileselector_Item_Data *it_data = elm_object_item_data_get(it);
962 962
963 _populate(data, it_data->model, it, NULL); 963 _populate(data, it_data->model, it, NULL);
964
965 return EINA_TRUE;
966} 964}
967 965
968static Eina_Bool 966static void
969_on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event) 967_on_list_contracted(void *data EINA_UNUSED, const Eo_Event *event)
970{ 968{
971 Elm_Object_Item *it = event->info; 969 Elm_Object_Item *it = event->info;
972 970
973 elm_genlist_item_subitems_clear(it); 971 elm_genlist_item_subitems_clear(it);
974
975 return EINA_TRUE;
976} 972}
977 973
978static Eina_Bool 974static void
979_on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event) 975_on_list_expand_req(void *data EINA_UNUSED, const Eo_Event *event)
980{ 976{
981 Elm_Object_Item *it = event->info; 977 Elm_Object_Item *it = event->info;
982 978
983 elm_genlist_item_expanded_set(it, EINA_TRUE); 979 elm_genlist_item_expanded_set(it, EINA_TRUE);
984
985 return EINA_TRUE;
986} 980}
987 981
988static Eina_Bool 982static void
989_on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event) 983_on_list_contract_req(void *data EINA_UNUSED, const Eo_Event *event)
990{ 984{
991 Elm_Object_Item *it = event->info; 985 Elm_Object_Item *it = event->info;
992 986
993 elm_genlist_item_expanded_set(it, EINA_FALSE); 987 elm_genlist_item_expanded_set(it, EINA_FALSE);
994
995 return EINA_TRUE;
996} 988}
997 989
998static Eina_Bool 990static Eina_Bool
@@ -1042,7 +1034,7 @@ _schedule_populate(Evas_Object *fs,
1042 sd->populate_idler = ecore_idler_add(_populate_do, sdata); 1034 sd->populate_idler = ecore_idler_add(_populate_do, sdata);
1043} 1035}
1044 1036
1045static Eina_Bool 1037static void
1046_on_item_activated(void *data, const Eo_Event *event) 1038_on_item_activated(void *data, const Eo_Event *event)
1047{ 1039{
1048 //This event_info could be a list or gengrid item 1040 //This event_info could be a list or gengrid item
@@ -1052,7 +1044,7 @@ _on_item_activated(void *data, const Eo_Event *event)
1052 ELM_FILESELECTOR_DATA_GET(data, sd); 1044 ELM_FILESELECTOR_DATA_GET(data, sd);
1053 1045
1054 it_data = elm_object_item_data_get(it); 1046 it_data = elm_object_item_data_get(it);
1055 if (!it_data) return EINA_TRUE; 1047 if (!it_data) return;
1056 1048
1057 if (!it_data->is_dir) 1049 if (!it_data->is_dir)
1058 { 1050 {
@@ -1060,14 +1052,12 @@ _on_item_activated(void *data, const Eo_Event *event)
1060 //eo_event_callback_call 1052 //eo_event_callback_call
1061 // (data, ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)it_data->model); 1053 // (data, ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)it_data->model);
1062 evas_object_smart_callback_call(data, "activated", (void *)it_data->path); 1054 evas_object_smart_callback_call(data, "activated", (void *)it_data->path);
1063 return EINA_TRUE; 1055 return;
1064 } 1056 }
1065 1057
1066 if (!sd->double_tap_navigation) return EINA_TRUE; 1058 if (!sd->double_tap_navigation) return;
1067 1059
1068 _schedule_populate(data, sd, it_data->model, NULL); 1060 _schedule_populate(data, sd, it_data->model, NULL);
1069
1070 return EINA_TRUE;
1071} 1061}
1072 1062
1073static void 1063static void
@@ -1098,7 +1088,7 @@ _clear_selections(Elm_Fileselector_Data *sd, Elm_Object_Item *last_selected)
1098 } 1088 }
1099} 1089}
1100 1090
1101static Eina_Bool 1091static void
1102_on_item_selected(void *data, const Eo_Event *event) 1092_on_item_selected(void *data, const Eo_Event *event)
1103{ 1093{
1104 //This event_info could be a list or gengrid item 1094 //This event_info could be a list or gengrid item
@@ -1108,7 +1098,7 @@ _on_item_selected(void *data, const Eo_Event *event)
1108 ELM_FILESELECTOR_DATA_GET(data, sd); 1098 ELM_FILESELECTOR_DATA_GET(data, sd);
1109 1099
1110 it_data = elm_object_item_data_get(it); 1100 it_data = elm_object_item_data_get(it);
1111 if (!it_data) return EINA_TRUE; 1101 if (!it_data) return;
1112 1102
1113 /* We need to send callback when: 1103 /* We need to send callback when:
1114 * - path is dir and mode is ONLY FOLDER 1104 * - path is dir and mode is ONLY FOLDER
@@ -1166,7 +1156,7 @@ _on_item_selected(void *data, const Eo_Event *event)
1166 { 1156 {
1167 _elm_fileselector_replace_model(data, sd, it_data->parent_model, it_data->parent_path); 1157 _elm_fileselector_replace_model(data, sd, it_data->parent_model, it_data->parent_path);
1168 _anchors_do(data, it_data->parent_path); 1158 _anchors_do(data, it_data->parent_path);
1169 return EINA_TRUE; 1159 return;
1170 } 1160 }
1171 if (sd->only_folder) 1161 if (sd->only_folder)
1172 { 1162 {
@@ -1181,19 +1171,17 @@ _on_item_selected(void *data, const Eo_Event *event)
1181 // Clear name entry not in case of save mode. 1171 // Clear name entry not in case of save mode.
1182 if (elm_object_disabled_get(sd->name_entry)) 1172 if (elm_object_disabled_get(sd->name_entry))
1183 elm_object_text_set(sd->name_entry, ""); 1173 elm_object_text_set(sd->name_entry, "");
1184 return EINA_TRUE; 1174 return;
1185 } 1175 }
1186 1176
1187 if (!it_data->is_dir) return EINA_TRUE; 1177 if (!it_data->is_dir) return;
1188 1178
1189 if (sd->double_tap_navigation) return EINA_TRUE; 1179 if (sd->double_tap_navigation) return;
1190 1180
1191 _schedule_populate(data, sd, it_data->model, NULL); 1181 _schedule_populate(data, sd, it_data->model, NULL);
1192
1193 return EINA_TRUE;
1194} 1182}
1195 1183
1196static Eina_Bool 1184static void
1197_on_item_unselected(void *data, const Eo_Event *event) 1185_on_item_unselected(void *data, const Eo_Event *event)
1198{ 1186{
1199 Eina_List *li, *l; 1187 Eina_List *li, *l;
@@ -1205,10 +1193,10 @@ _on_item_unselected(void *data, const Eo_Event *event)
1205 1193
1206 ELM_FILESELECTOR_DATA_GET(data, sd); 1194 ELM_FILESELECTOR_DATA_GET(data, sd);
1207 1195
1208 if (!sd->multi) return EINA_TRUE; 1196 if (!sd->multi) return;
1209 1197
1210 it_data = elm_object_item_data_get(it); 1198 it_data = elm_object_item_data_get(it);
1211 if (!it_data) return EINA_TRUE; 1199 if (!it_data) return;
1212 1200
1213 buf = eina_strbuf_new(); 1201 buf = eina_strbuf_new();
1214 EINA_LIST_FOREACH_SAFE(sd->multi_selection, li, l, it2) 1202 EINA_LIST_FOREACH_SAFE(sd->multi_selection, li, l, it2)
@@ -1233,11 +1221,9 @@ _on_item_unselected(void *data, const Eo_Event *event)
1233 1221
1234 elm_object_text_set(sd->name_entry, eina_strbuf_string_get(buf)); 1222 elm_object_text_set(sd->name_entry, eina_strbuf_string_get(buf));
1235 eina_strbuf_free(buf); 1223 eina_strbuf_free(buf);
1236
1237 return EINA_TRUE;
1238} 1224}
1239 1225
1240static Eina_Bool 1226static void
1241_on_dir_up(void *data, const Eo_Event *event EINA_UNUSED) 1227_on_dir_up(void *data, const Eo_Event *event EINA_UNUSED)
1242{ 1228{
1243 Evas_Object *fs = data; 1229 Evas_Object *fs = data;
@@ -1247,13 +1233,11 @@ _on_dir_up(void *data, const Eo_Event *event EINA_UNUSED)
1247 1233
1248 parent = eo_parent_get(sd->model); 1234 parent = eo_parent_get(sd->model);
1249 if (!parent) 1235 if (!parent)
1250 return EINA_TRUE; 1236 return;
1251 _populate(fs, parent, NULL, NULL); 1237 _populate(fs, parent, NULL, NULL);
1252
1253 return EINA_TRUE;
1254} 1238}
1255 1239
1256static Eina_Bool 1240static void
1257_home(void *data, const Eo_Event *event EINA_UNUSED) 1241_home(void *data, const Eo_Event *event EINA_UNUSED)
1258{ 1242{
1259 Evas_Object *fs = data; 1243 Evas_Object *fs = data;
@@ -1267,8 +1251,6 @@ _home(void *data, const Eo_Event *event EINA_UNUSED)
1267 _populate(fs, model, NULL, NULL); 1251 _populate(fs, model, NULL, NULL);
1268 eo_unref(model); 1252 eo_unref(model);
1269 } 1253 }
1270
1271 return EINA_TRUE;
1272} 1254}
1273 1255
1274static void 1256static void
@@ -1286,7 +1268,7 @@ _current_filter_changed(void *data,
1286 _populate(filter->sd->obj, filter->sd->model, NULL, NULL); 1268 _populate(filter->sd->obj, filter->sd->model, NULL, NULL);
1287} 1269}
1288 1270
1289static Eina_Bool 1271static void
1290_ok(void *data, const Eo_Event *event EINA_UNUSED) 1272_ok(void *data, const Eo_Event *event EINA_UNUSED)
1291{ 1273{
1292 const char *name; 1274 const char *name;
@@ -1299,7 +1281,7 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
1299 // EVENTS: should not call legacy 1281 // EVENTS: should not call legacy
1300 //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL); 1282 //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
1301 evas_object_smart_callback_call(fs, "done", NULL); 1283 evas_object_smart_callback_call(fs, "done", NULL);
1302 return EINA_TRUE; 1284 return;
1303 } 1285 }
1304 1286
1305 name = elm_object_text_get(sd->name_entry); 1287 name = elm_object_text_get(sd->name_entry);
@@ -1338,11 +1320,9 @@ _ok(void *data, const Eo_Event *event EINA_UNUSED)
1338 // (fs, ELM_FILESELECTOR_EVENT_DONE, sd->model); 1320 // (fs, ELM_FILESELECTOR_EVENT_DONE, sd->model);
1339 evas_object_smart_callback_call(fs, "done", (void *) sd->path); 1321 evas_object_smart_callback_call(fs, "done", (void *) sd->path);
1340 } 1322 }
1341
1342 return EINA_TRUE;
1343} 1323}
1344 1324
1345static Eina_Bool 1325static void
1346_canc(void *data, const Eo_Event *event EINA_UNUSED) 1326_canc(void *data, const Eo_Event *event EINA_UNUSED)
1347{ 1327{
1348 Evas_Object *fs = data; 1328 Evas_Object *fs = data;
@@ -1350,8 +1330,6 @@ _canc(void *data, const Eo_Event *event EINA_UNUSED)
1350 // EVENTS: should not call legacy 1330 // EVENTS: should not call legacy
1351 //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL); 1331 //eo_event_callback_call(fs, ELM_FILESELECTOR_EVENT_DONE, NULL);
1352 evas_object_smart_callback_call(fs, "done", NULL); 1332 evas_object_smart_callback_call(fs, "done", NULL);
1353
1354 return EINA_TRUE;
1355} 1333}
1356 1334
1357static void 1335static void
@@ -1457,7 +1435,7 @@ _on_text_activated_set_path_then_error(void *data, Eina_Error err EINA_UNUSED)
1457 _text_activated_free_fs_data(fs); 1435 _text_activated_free_fs_data(fs);
1458} 1436}
1459 1437
1460static Eina_Bool 1438static void
1461_on_text_activated(void *data, const Eo_Event *event) 1439_on_text_activated(void *data, const Eo_Event *event)
1462{ 1440{
1463 Evas_Object *fs = data; 1441 Evas_Object *fs = data;
@@ -1468,12 +1446,12 @@ _on_text_activated(void *data, const Eo_Event *event)
1468 ELM_FILESELECTOR_DATA_GET(fs, sd); 1446 ELM_FILESELECTOR_DATA_GET(fs, sd);
1469 1447
1470 if (!sd->model) 1448 if (!sd->model)
1471 return EINA_TRUE; 1449 return;
1472 1450
1473 path = elm_widget_part_text_get(event->object, NULL); 1451 path = elm_widget_part_text_get(event->object, NULL);
1474 model = eo_add(eo_class_get(sd->model), NULL); 1452 model = eo_add(eo_class_get(sd->model), NULL);
1475 if (!model) 1453 if (!model)
1476 return EINA_TRUE; 1454 return;
1477 1455
1478 _model_str_property_set(model, "path", path, &promise); 1456 _model_str_property_set(model, "path", path, &promise);
1479 1457
@@ -1487,8 +1465,6 @@ _on_text_activated(void *data, const Eo_Event *event)
1487 1465
1488 eo_unref(model); 1466 eo_unref(model);
1489 elm_object_focus_set(event->object, EINA_FALSE); 1467 elm_object_focus_set(event->object, EINA_FALSE);
1490
1491 return EINA_TRUE;
1492} 1468}
1493 1469
1494static Eina_Bool 1470static Eina_Bool
@@ -1504,27 +1480,23 @@ _anchors_undo(void *data)
1504 return ECORE_CALLBACK_CANCEL; 1480 return ECORE_CALLBACK_CANCEL;
1505} 1481}
1506 1482
1507static Eina_Bool 1483static void
1508_on_text_focused(void *data, const Eo_Event *event EINA_UNUSED) 1484_on_text_focused(void *data, const Eo_Event *event EINA_UNUSED)
1509{ 1485{
1510 ELM_FILESELECTOR_DATA_GET(data, sd); 1486 ELM_FILESELECTOR_DATA_GET(data, sd);
1511 1487
1512 if (!sd->path_entry_idler) 1488 if (!sd->path_entry_idler)
1513 sd->path_entry_idler = ecore_idler_add(_anchors_undo, data); 1489 sd->path_entry_idler = ecore_idler_add(_anchors_undo, data);
1514
1515 return EINA_TRUE;
1516} 1490}
1517 1491
1518static Eina_Bool 1492static void
1519_on_text_unfocused(void *data, const Eo_Event *event EINA_UNUSED) 1493_on_text_unfocused(void *data, const Eo_Event *event EINA_UNUSED)
1520{ 1494{
1521 ELM_FILESELECTOR_DATA_GET(data, sd); 1495 ELM_FILESELECTOR_DATA_GET(data, sd);
1522 _anchors_do(data, sd->path); 1496 _anchors_do(data, sd->path);
1523
1524 return EINA_TRUE;
1525} 1497}
1526 1498
1527static Eina_Bool 1499static void
1528_anchor_clicked(void *data, const Eo_Event *event) 1500_anchor_clicked(void *data, const Eo_Event *event)
1529{ 1501{
1530 Elm_Entry_Anchor_Info *info = event->info; 1502 Elm_Entry_Anchor_Info *info = event->info;
@@ -1534,11 +1506,11 @@ _anchor_clicked(void *data, const Eo_Event *event)
1534 ELM_FILESELECTOR_DATA_GET(fs, sd); 1506 ELM_FILESELECTOR_DATA_GET(fs, sd);
1535 1507
1536 if (!sd->model) 1508 if (!sd->model)
1537 return EINA_TRUE; 1509 return;
1538 1510
1539 model = eo_add(eo_class_get(sd->model), NULL); 1511 model = eo_add(eo_class_get(sd->model), NULL);
1540 if (!model) 1512 if (!model)
1541 return EINA_TRUE; 1513 return;
1542 _model_str_property_set(model, "path", info->name, NULL); 1514 _model_str_property_set(model, "path", info->name, NULL);
1543 1515
1544 _populate(fs, model, NULL, NULL); 1516 _populate(fs, model, NULL, NULL);
@@ -1551,11 +1523,9 @@ _anchor_clicked(void *data, const Eo_Event *event)
1551 ecore_idler_del(sd->path_entry_idler); 1523 ecore_idler_del(sd->path_entry_idler);
1552 sd->path_entry_idler = NULL; 1524 sd->path_entry_idler = NULL;
1553 } 1525 }
1554
1555 return EINA_TRUE;
1556} 1526}
1557 1527
1558static Eina_Bool 1528static void
1559_files_key_down(void *data, const Eo_Event *event) 1529_files_key_down(void *data, const Eo_Event *event)
1560{ 1530{
1561 Efl_Event_Key *ev = event->info; 1531 Efl_Event_Key *ev = event->info;
@@ -1565,7 +1535,7 @@ _files_key_down(void *data, const Eo_Event *event)
1565 par = data; 1535 par = data;
1566 searchbar = evas_object_data_get(par, "search"); 1536 searchbar = evas_object_data_get(par, "search");
1567 1537
1568 if (!searchbar) return EINA_TRUE; 1538 if (!searchbar) return;
1569 1539
1570 key = efl_event_key_get(ev); 1540 key = efl_event_key_get(ev);
1571 string = efl_event_key_string_get(ev); 1541 string = efl_event_key_string_get(ev);
@@ -1588,8 +1558,6 @@ _files_key_down(void *data, const Eo_Event *event)
1588 efl_event_processed_set(ev, EINA_TRUE); 1558 efl_event_processed_set(ev, EINA_TRUE);
1589 } 1559 }
1590 } 1560 }
1591
1592 return EINA_TRUE;
1593} 1561}
1594 1562
1595static Evas_Object * 1563static Evas_Object *
@@ -1733,7 +1701,7 @@ cancel:
1733 free(it_data); 1701 free(it_data);
1734} 1702}
1735 1703
1736static Eina_Bool 1704static void
1737_resource_created(void *data, const Eo_Event *event) 1705_resource_created(void *data, const Eo_Event *event)
1738{ 1706{
1739 Elm_Fileselector *fs = data; 1707 Elm_Fileselector *fs = data;
@@ -1746,11 +1714,11 @@ _resource_created(void *data, const Eo_Event *event)
1746 ELM_FILESELECTOR_DATA_GET(fs, sd); 1714 ELM_FILESELECTOR_DATA_GET(fs, sd);
1747 1715
1748 if (!sd || !sd->monitoring || sd->model != event->object) 1716 if (!sd || !sd->monitoring || sd->model != event->object)
1749 return ECORE_CALLBACK_PASS_ON; 1717 return;
1750 1718
1751 it_data = calloc(1, sizeof(Elm_Fileselector_Item_Data)); 1719 it_data = calloc(1, sizeof(Elm_Fileselector_Item_Data));
1752 if (!it_data) 1720 if (!it_data)
1753 return ECORE_CALLBACK_PASS_ON; 1721 return;
1754 1722
1755 it_data->model = eo_ref(child); 1723 it_data->model = eo_ref(child);
1756 it_data->user_data = eo_ref(fs); 1724 it_data->user_data = eo_ref(fs);
@@ -1769,10 +1737,10 @@ _resource_created(void *data, const Eo_Event *event)
1769 1737
1770 eina_promise_then(promise_all, _resource_created_then, _resource_then_error, it_data); 1738 eina_promise_then(promise_all, _resource_created_then, _resource_then_error, it_data);
1771 1739
1772 return ECORE_CALLBACK_PASS_ON; 1740 return;
1773} 1741}
1774 1742
1775static Eina_Bool 1743static void
1776_resource_deleted(void *data, const Eo_Event *event) 1744_resource_deleted(void *data, const Eo_Event *event)
1777{ 1745{
1778 Evas_Object *obj = data; 1746 Evas_Object *obj = data;
@@ -1784,7 +1752,7 @@ _resource_deleted(void *data, const Eo_Event *event)
1784 ELM_FILESELECTOR_DATA_GET(obj, sd); 1752 ELM_FILESELECTOR_DATA_GET(obj, sd);
1785 1753
1786 if (!sd || !sd->monitoring || sd->model != event->object) 1754 if (!sd || !sd->monitoring || sd->model != event->object)
1787 return ECORE_CALLBACK_PASS_ON; 1755 return;
1788 1756
1789 if (sd->mode == ELM_FILESELECTOR_LIST) 1757 if (sd->mode == ELM_FILESELECTOR_LIST)
1790 { 1758 {
@@ -1852,10 +1820,10 @@ _resource_deleted(void *data, const Eo_Event *event)
1852 elm_object_text_set(sd->name_entry, ""); 1820 elm_object_text_set(sd->name_entry, "");
1853 } 1821 }
1854 1822
1855 return ECORE_CALLBACK_PASS_ON; 1823 return;
1856} 1824}
1857 1825
1858static Eina_Bool 1826static void
1859_preedit_cb(void *data, const Eo_Event *event) 1827_preedit_cb(void *data, const Eo_Event *event)
1860{ 1828{
1861 ELM_FILESELECTOR_DATA_GET(data, sd); 1829 ELM_FILESELECTOR_DATA_GET(data, sd);
@@ -1864,8 +1832,6 @@ _preedit_cb(void *data, const Eo_Event *event)
1864 1832
1865 if (sd->search_string && sd->model) 1833 if (sd->search_string && sd->model)
1866 _populate(data, sd->model, NULL, NULL); 1834 _populate(data, sd->model, NULL, NULL);
1867
1868 return EINA_TRUE;
1869} 1835}
1870 1836
1871EOLIAN static void 1837EOLIAN static void
diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c
index 23e53e306d..ff18f2d15b 100644
--- a/src/lib/elementary/elc_fileselector_button.c
+++ b/src/lib/elementary/elc_fileselector_button.c
@@ -84,7 +84,7 @@ _replace_path_then_error(void *data, Eina_Error err EINA_UNUSED)
84 eina_stringshare_replace(&sd->fsd.path, NULL); 84 eina_stringshare_replace(&sd->fsd.path, NULL);
85} 85}
86 86
87static Eina_Bool 87static void
88_selection_done(void *data, const Eo_Event *event) 88_selection_done(void *data, const Eo_Event *event)
89{ 89{
90 Elm_Fileselector_Button_Data *sd = data; 90 Elm_Fileselector_Button_Data *sd = data;
@@ -109,8 +109,6 @@ _selection_done(void *data, const Eo_Event *event)
109 // EVENTS: should not call legacy 109 // EVENTS: should not call legacy
110 //eo_event_callback_call 110 //eo_event_callback_call
111 // (sd->obj, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN, (void *)model); 111 // (sd->obj, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN, (void *)model);
112
113 return EINA_TRUE;
114} 112}
115 113
116 114
@@ -209,12 +207,10 @@ _activate(Elm_Fileselector_Button_Data *sd)
209 } 207 }
210} 208}
211 209
212static Eina_Bool 210static void
213_button_clicked(void *data, const Eo_Event *event EINA_UNUSED) 211_button_clicked(void *data, const Eo_Event *event EINA_UNUSED)
214{ 212{
215 _activate(data); 213 _activate(data);
216
217 return EINA_TRUE;
218} 214}
219 215
220EOLIAN static void 216EOLIAN static void
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index e15414b6ab..970c5bcbe1 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -46,12 +46,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
46#undef ELM_PRIV_FILESELECTOR_ENTRY_SIGNALS 46#undef ELM_PRIV_FILESELECTOR_ENTRY_SIGNALS
47 47
48#define SIG_FWD(name, event) \ 48#define SIG_FWD(name, event) \
49 static Eina_Bool \ 49 static void \
50 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \ 50 _##name##_fwd(void *data, const Eo_Event *ev EINA_UNUSED) \
51 { \ 51 { \
52 eo_event_callback_call(data, event, ev->info); \ 52 eo_event_callback_call(data, event, ev->info); \
53 \
54 return EINA_TRUE; \
55 } 53 }
56SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED) 54SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED)
57SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS) 55SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
@@ -84,13 +82,13 @@ _file_chosen_path_then(void *data, void *v)
84 free(s); 82 free(s);
85} 83}
86 84
87static Eina_Bool 85static void
88_FILE_CHOSEN_fwd(void *data, const Eo_Event *event) 86_FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
89{ 87{
90 Efl_Model *model = event->info; 88 Efl_Model *model = event->info;
91 Eina_Promise *promise = NULL; 89 Eina_Promise *promise = NULL;
92 90
93 if (!model) return EINA_TRUE; 91 if (!model) return;
94 92
95 promise = efl_model_property_get(model, "path"); 93 promise = efl_model_property_get(model, "path");
96 eina_promise_then(promise, _file_chosen_path_then, NULL, data); 94 eina_promise_then(promise, _file_chosen_path_then, NULL, data);
@@ -98,8 +96,6 @@ _FILE_CHOSEN_fwd(void *data, const Eo_Event *event)
98 // EVENTS: should not call legacy 96 // EVENTS: should not call legacy
99 //eo_event_callback_call 97 //eo_event_callback_call
100 // (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info); 98 // (data, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN, event->info);
101
102 return EINA_TRUE;
103} 99}
104 100
105// EVENTS: should not need this function 101// EVENTS: should not need this function
@@ -114,7 +110,7 @@ _FILE_CHOSEN_fwd_path(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
114 _FILE_CHOSEN_fwd(data, &e); 110 _FILE_CHOSEN_fwd(data, &e);
115} 111}
116 112
117static Eina_Bool 113static void
118_ACTIVATED_fwd(void *data, const Eo_Event *event) 114_ACTIVATED_fwd(void *data, const Eo_Event *event)
119{ 115{
120 const char *file; 116 const char *file;
@@ -138,8 +134,6 @@ _ACTIVATED_fwd(void *data, const Eo_Event *event)
138 134
139 eo_event_callback_call 135 eo_event_callback_call
140 (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info); 136 (data, ELM_FILESELECTOR_ENTRY_EVENT_ACTIVATED, event->info);
141
142 return EINA_TRUE;
143} 137}
144 138
145static void 139static void
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 43d91677c6..fc3b4ba249 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -109,7 +109,7 @@ _elm_hoversel_elm_widget_theme_apply(Eo *obj, Elm_Hoversel_Data *sd)
109 return EINA_TRUE; 109 return EINA_TRUE;
110} 110}
111 111
112static Eina_Bool 112static void
113_on_hover_clicked(void *data, const Eo_Event *event) 113_on_hover_clicked(void *data, const Eo_Event *event)
114{ 114{
115 const char *dismissstr; 115 const char *dismissstr;
@@ -118,8 +118,6 @@ _on_hover_clicked(void *data, const Eo_Event *event)
118 118
119 if (!dismissstr || strcmp(dismissstr, "on")) 119 if (!dismissstr || strcmp(dismissstr, "on"))
120 elm_hoversel_hover_end(data); // for backward compatibility 120 elm_hoversel_hover_end(data); // for backward compatibility
121
122 return EINA_TRUE;
123} 121}
124 122
125static void 123static void
@@ -153,7 +151,7 @@ _auto_update(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
153 } 151 }
154} 152}
155 153
156static Eina_Bool 154static void
157_on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 155_on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
158{ 156{
159 Elm_Hoversel_Item_Data *item = data; 157 Elm_Hoversel_Item_Data *item = data;
@@ -168,28 +166,22 @@ _on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
168 evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item); 166 evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item);
169 167
170 elm_hoversel_hover_end(obj2); 168 elm_hoversel_hover_end(obj2);
171
172 return EINA_TRUE;
173} 169}
174 170
175static Eina_Bool 171static void
176_item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 172_item_focused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
177{ 173{
178 Elm_Hoversel_Item_Data *it = data; 174 Elm_Hoversel_Item_Data *it = data;
179 175
180 eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it)); 176 eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_FOCUSED, EO_OBJ(it));
181
182 return EINA_TRUE;
183} 177}
184 178
185static Eina_Bool 179static void
186_item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED) 180_item_unfocused_cb(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
187{ 181{
188 Elm_Hoversel_Item_Data *it = data; 182 Elm_Hoversel_Item_Data *it = data;
189 183
190 eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it)); 184 eo_event_callback_call(WIDGET(it), ELM_HOVERSEL_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
191
192 return EINA_TRUE;
193} 185}
194 186
195static void 187static void
@@ -440,20 +432,16 @@ _activate(Evas_Object *obj)
440 evas_object_show(sd->hover); 432 evas_object_show(sd->hover);
441} 433}
442 434
443static Eina_Bool 435static void
444_on_clicked(void *data, const Eo_Event *event EINA_UNUSED) 436_on_clicked(void *data, const Eo_Event *event EINA_UNUSED)
445{ 437{
446 _activate(data); 438 _activate(data);
447
448 return EINA_TRUE;
449} 439}
450 440
451static Eina_Bool 441static void
452_on_parent_del(void *data, const Eo_Event *ev EINA_UNUSED) 442_on_parent_del(void *data, const Eo_Event *ev EINA_UNUSED)
453{ 443{
454 elm_hoversel_hover_parent_set(data, NULL); 444 elm_hoversel_hover_parent_set(data, NULL);
455
456 return EINA_TRUE;
457} 445}
458 446
459EOLIAN static void 447EOLIAN static void
@@ -550,14 +538,12 @@ _on_move_resize(void * data,
550 _resizing_eval(obj, sd); 538 _resizing_eval(obj, sd);
551} 539}
552 540
553static Eina_Bool 541static void
554_on_parent_resize(void *data, const Eo_Event *ev EINA_UNUSED) 542_on_parent_resize(void *data, const Eo_Event *ev EINA_UNUSED)
555{ 543{
556 Evas_Object *obj = (Evas_Object *)data; 544 Evas_Object *obj = (Evas_Object *)data;
557 ELM_HOVERSEL_DATA_GET(obj, sd); 545 ELM_HOVERSEL_DATA_GET(obj, sd);
558 _on_move_resize(sd, NULL, obj, NULL); 546 _on_move_resize(sd, NULL, obj, NULL);
559
560 return EINA_TRUE;
561} 547}
562 548
563EOLIAN static void 549EOLIAN static void
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index e19ea287a9..5932ca2824 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -45,14 +45,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
45 {NULL, NULL} 45 {NULL, NULL}
46}; 46};
47 47
48static Eina_Bool 48static void _entry_changed_cb(void *data, const Eo_Event *event);
49_entry_changed_cb(void *data, const Eo_Event *event); 49static void _entry_focus_in_cb(void *data, const Eo_Event *event);
50static Eina_Bool 50static void _entry_focus_out_cb(void *data, const Eo_Event *event);
51_entry_focus_in_cb(void *data, const Eo_Event *event); 51static void _entry_clicked_cb(void *data, const Eo_Event *event);
52static Eina_Bool
53_entry_focus_out_cb(void *data, const Eo_Event *event);
54static Eina_Bool
55_entry_clicked_cb(void *data, const Eo_Event *event);
56 52
57EO_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb, 53EO_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
58 { ELM_MULTIBUTTONENTRY_EVENT_CHANGED, _entry_changed_cb }, 54 { ELM_MULTIBUTTONENTRY_EVENT_CHANGED, _entry_changed_cb },
@@ -1039,23 +1035,21 @@ _entry_resize_cb(void *data,
1039 elm_widget_show_region_set(sd->entry, en_x, en_y, en_w, en_h, EINA_TRUE); 1035 elm_widget_show_region_set(sd->entry, en_x, en_y, en_w, en_h, EINA_TRUE);
1040} 1036}
1041 1037
1042static Eina_Bool 1038static void
1043_entry_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 1039_entry_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
1044{ 1040{
1045 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); 1041 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1046 const char *str; 1042 const char *str;
1047 1043
1048 str = elm_object_text_get(sd->entry); 1044 str = elm_object_text_get(sd->entry);
1049 sd->n_str = str ? strlen(str) : 0; 1045 sd->n_str = str ? strlen(str) : 0;
1050
1051 return EINA_TRUE;
1052} 1046}
1053 1047
1054static Eina_Bool 1048static void
1055_entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED) 1049_entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED)
1056{ 1050{
1057 Elm_Multibuttonentry_Item_Data *item = NULL; 1051 Elm_Multibuttonentry_Item_Data *item = NULL;
1058 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); 1052 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1059 1053
1060 if (sd->selected_it) 1054 if (sd->selected_it)
1061 { 1055 {
@@ -1063,32 +1057,26 @@ _entry_focus_in_cb(void *data, const Eo_Event *event EINA_UNUSED)
1063 elm_object_focus_set(sd->entry, EINA_FALSE); 1057 elm_object_focus_set(sd->entry, EINA_FALSE);
1064 elm_object_focus_set(VIEW(item), EINA_TRUE); 1058 elm_object_focus_set(VIEW(item), EINA_TRUE);
1065 } 1059 }
1066
1067 return EINA_TRUE;
1068} 1060}
1069 1061
1070static Eina_Bool 1062static void
1071_entry_focus_out_cb(void *data, const Eo_Event *event EINA_UNUSED) 1063_entry_focus_out_cb(void *data, const Eo_Event *event EINA_UNUSED)
1072{ 1064{
1073 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); 1065 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1074 const char *str; 1066 const char *str;
1075 1067
1076 str = elm_object_text_get(sd->entry); 1068 str = elm_object_text_get(sd->entry);
1077 if (str && str[0]) 1069 if (str && str[0])
1078 _item_new(sd, str, MULTIBUTTONENTRY_POS_END, NULL, NULL, NULL); 1070 _item_new(sd, str, MULTIBUTTONENTRY_POS_END, NULL, NULL, NULL);
1079
1080 return EINA_TRUE;
1081} 1071}
1082 1072
1083static Eina_Bool 1073static void
1084_entry_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 1074_entry_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
1085{ 1075{
1086 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN_VAL(data, sd, EINA_TRUE); 1076 ELM_MULTIBUTTONENTRY_DATA_GET_OR_RETURN(data, sd);
1087 1077
1088 _current_item_state_change(sd->parent, MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT); 1078 _current_item_state_change(sd->parent, MULTIBUTTONENTRY_BUTTON_STATE_DEFAULT);
1089 elm_object_focus_set(sd->entry, EINA_TRUE); 1079 elm_object_focus_set(sd->entry, EINA_TRUE);
1090
1091 return EINA_TRUE;
1092} 1080}
1093 1081
1094static void 1082static void
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index 8b6a720851..7f53e7dbb4 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -42,7 +42,7 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
42 {NULL, NULL} 42 {NULL, NULL}
43}; 43};
44 44
45static Eina_Bool _on_item_back_btn_clicked(void *data, const Eo_Event *event); 45static void _on_item_back_btn_clicked(void *data, const Eo_Event *event);
46 46
47static Eina_Bool _key_action_top_item_get(Evas_Object *obj, const char *params); 47static Eina_Bool _key_action_top_item_get(Evas_Object *obj, const char *params);
48 48
@@ -953,7 +953,7 @@ _elm_naviframe_elm_layout_sizing_eval(Eo *obj, Elm_Naviframe_Data *sd)
953 evas_object_size_hint_max_set(obj, -1, -1); 953 evas_object_size_hint_max_set(obj, -1, -1);
954} 954}
955 955
956static Eina_Bool 956static void
957_on_item_back_btn_clicked(void *data, const Eo_Event *event) 957_on_item_back_btn_clicked(void *data, const Eo_Event *event)
958{ 958{
959 /* Since edje has the event queue, clicked event could be happened 959 /* Since edje has the event queue, clicked event could be happened
@@ -962,8 +962,6 @@ _on_item_back_btn_clicked(void *data, const Eo_Event *event)
962 page. */ 962 page. */
963 eo_event_callback_del(event->object, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, data); 963 eo_event_callback_del(event->object, EFL_UI_EVENT_CLICKED, _on_item_back_btn_clicked, data);
964 elm_naviframe_item_pop(data); 964 elm_naviframe_item_pop(data);
965
966 return EINA_TRUE;
967} 965}
968 966
969static Evas_Object * 967static Evas_Object *
@@ -1415,7 +1413,7 @@ _send_signal(Elm_Naviframe_Item_Data *it, const char *sig)
1415 edje_object_message_signal_process(elm_layout_edje_get(VIEW(it))); 1413 edje_object_message_signal_process(elm_layout_edje_get(VIEW(it)));
1416} 1414}
1417 1415
1418static Eina_Bool 1416static void
1419_deferred(void *data, const Eo_Event *event EINA_UNUSED) 1417_deferred(void *data, const Eo_Event *event EINA_UNUSED)
1420{ 1418{
1421 Elm_Naviframe_Data *nfd = data; 1419 Elm_Naviframe_Data *nfd = data;
@@ -1442,7 +1440,6 @@ _deferred(void *data, const Eo_Event *event EINA_UNUSED)
1442 } 1440 }
1443 1441
1444 eo_event_callback_del(nfd->obj, EFL_EVENT_ANIMATOR_TICK, _deferred, nfd); 1442 eo_event_callback_del(nfd->obj, EFL_EVENT_ANIMATOR_TICK, _deferred, nfd);
1445 return EO_CALLBACK_CONTINUE;
1446} 1443}
1447 1444
1448EOLIAN static void 1445EOLIAN static void
diff --git a/src/lib/elementary/elc_player.c b/src/lib/elementary/elc_player.c
index 9c3c9244da..a4e9551ee2 100644
--- a/src/lib/elementary/elc_player.c
+++ b/src/lib/elementary/elc_player.c
@@ -60,20 +60,13 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
60 { NULL, NULL } 60 { NULL, NULL }
61}; 61};
62 62
63static Eina_Bool 63static void _update_frame(void *data, const Eo_Event *event);
64_update_frame(void *data, const Eo_Event *event); 64static void _update_slider(void *data, const Eo_Event *event);
65static Eina_Bool 65static void _play_started(void *data, const Eo_Event *event);
66_update_slider(void *data, const Eo_Event *event); 66static void _play_finished(void *data, const Eo_Event *event);
67static Eina_Bool 67static void _update_position(void *data, const Eo_Event *event);
68_play_started(void *data, const Eo_Event *event); 68static void _drag_start(void *data, const Eo_Event *event);
69static Eina_Bool 69static void _drag_stop(void *data, const Eo_Event *event);
70_play_finished(void *data, const Eo_Event *event);
71static Eina_Bool
72_update_position(void *data, const Eo_Event *event);
73static Eina_Bool
74_drag_start(void *data, const Eo_Event *event);
75static Eina_Bool
76_drag_stop(void *data, const Eo_Event *event);
77 70
78static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); 71static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
79static Eina_Bool _key_action_play(Evas_Object *obj, const char *params); 72static Eina_Bool _key_action_play(Evas_Object *obj, const char *params);
@@ -244,14 +237,14 @@ _elm_player_elm_layout_sizing_eval(Eo *obj, Elm_Player_Data *sd EINA_UNUSED)
244 evas_object_size_hint_min_set(obj, w, h); 237 evas_object_size_hint_min_set(obj, w, h);
245} 238}
246 239
247static Eina_Bool 240static void
248_update_slider(void *data, const Eo_Event *event EINA_UNUSED) 241_update_slider(void *data, const Eo_Event *event EINA_UNUSED)
249{ 242{
250 double pos, length; 243 double pos, length;
251 Eina_Bool seekable; 244 Eina_Bool seekable;
252 245
253 ELM_PLAYER_DATA_GET(data, sd); 246 ELM_PLAYER_DATA_GET(data, sd);
254 if (!sd) return EINA_TRUE; 247 if (!sd) return;
255 248
256 seekable = elm_video_is_seekable_get(sd->video); 249 seekable = elm_video_is_seekable_get(sd->video);
257 length = elm_video_play_length_get(sd->video); 250 length = elm_video_play_length_get(sd->video);
@@ -263,21 +256,17 @@ _update_slider(void *data, const Eo_Event *event EINA_UNUSED)
263 if ((elm_slider_value_get(sd->slider) != pos) && 256 if ((elm_slider_value_get(sd->slider) != pos) &&
264 (!sd->dragging)) 257 (!sd->dragging))
265 elm_slider_value_set(sd->slider, pos); 258 elm_slider_value_set(sd->slider, pos);
266
267 return EINA_TRUE;
268} 259}
269 260
270static Eina_Bool 261static void
271_update_frame(void *data, const Eo_Event *event) 262_update_frame(void *data, const Eo_Event *event)
272{ 263{
273 ELM_PLAYER_DATA_GET(data, sd); 264 ELM_PLAYER_DATA_GET(data, sd);
274 if (!sd) return EINA_TRUE; 265 if (!sd) return;
275 _update_slider(data, event); 266 _update_slider(data, event);
276
277 return EINA_TRUE;
278} 267}
279 268
280static Eina_Bool 269static void
281_update_position(void *data, const Eo_Event *event EINA_UNUSED) 270_update_position(void *data, const Eo_Event *event EINA_UNUSED)
282{ 271{
283 double pos; 272 double pos;
@@ -286,29 +275,23 @@ _update_position(void *data, const Eo_Event *event EINA_UNUSED)
286 pos = elm_slider_value_get(sd->slider); 275 pos = elm_slider_value_get(sd->slider);
287 if (pos != elm_video_play_position_get(sd->video)) 276 if (pos != elm_video_play_position_get(sd->video))
288 elm_video_play_position_set(sd->video, pos); 277 elm_video_play_position_set(sd->video, pos);
289
290 return EINA_TRUE;
291} 278}
292 279
293static Eina_Bool 280static void
294_drag_start(void *data, const Eo_Event *event EINA_UNUSED) 281_drag_start(void *data, const Eo_Event *event EINA_UNUSED)
295{ 282{
296 ELM_PLAYER_DATA_GET(data, sd); 283 ELM_PLAYER_DATA_GET(data, sd);
297 sd->dragging = EINA_TRUE; 284 sd->dragging = EINA_TRUE;
298
299 return EINA_TRUE;
300} 285}
301 286
302static Eina_Bool 287static void
303_drag_stop(void *data, const Eo_Event *event EINA_UNUSED) 288_drag_stop(void *data, const Eo_Event *event EINA_UNUSED)
304{ 289{
305 ELM_PLAYER_DATA_GET(data, sd); 290 ELM_PLAYER_DATA_GET(data, sd);
306 sd->dragging = EINA_FALSE; 291 sd->dragging = EINA_FALSE;
307
308 return EINA_TRUE;
309} 292}
310 293
311static Eina_Bool 294static void
312_update_volume(void *data, const Eo_Event *event EINA_UNUSED) 295_update_volume(void *data, const Eo_Event *event EINA_UNUSED)
313{ 296{
314 double vol; 297 double vol;
@@ -317,11 +300,9 @@ _update_volume(void *data, const Eo_Event *event EINA_UNUSED)
317 vol = elm_slider_value_get(sd->vslider) / 100.0; 300 vol = elm_slider_value_get(sd->vslider) / 100.0;
318 if (vol != elm_video_audio_level_get(sd->video)) 301 if (vol != elm_video_audio_level_get(sd->video))
319 elm_video_audio_level_set(sd->video, vol); 302 elm_video_audio_level_set(sd->video, vol);
320
321 return EINA_TRUE;
322} 303}
323 304
324static Eina_Bool 305static void
325_forward(void *data, const Eo_Event *event EINA_UNUSED) 306_forward(void *data, const Eo_Event *event EINA_UNUSED)
326{ 307{
327 double pos, length; 308 double pos, length;
@@ -335,29 +316,23 @@ _forward(void *data, const Eo_Event *event EINA_UNUSED)
335 316
336 elm_layout_signal_emit(data, "elm,button,forward", "elm"); 317 elm_layout_signal_emit(data, "elm,button,forward", "elm");
337 eo_event_callback_call(data, ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL); 318 eo_event_callback_call(data, ELM_PLAYER_EVENT_FORWARD_CLICKED, NULL);
338
339 return EINA_TRUE;
340} 319}
341 320
342static Eina_Bool 321static void
343_info(void *data, const Eo_Event *event EINA_UNUSED) 322_info(void *data, const Eo_Event *event EINA_UNUSED)
344{ 323{
345 elm_layout_signal_emit(data, "elm,button,info", "elm"); 324 elm_layout_signal_emit(data, "elm,button,info", "elm");
346 eo_event_callback_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL); 325 eo_event_callback_call(data, ELM_PLAYER_EVENT_INFO_CLICKED, NULL);
347
348 return EINA_TRUE;
349} 326}
350 327
351static Eina_Bool 328static void
352_next(void *data, const Eo_Event *event EINA_UNUSED) 329_next(void *data, const Eo_Event *event EINA_UNUSED)
353{ 330{
354 elm_layout_signal_emit(data, "elm,button,next", "elm"); 331 elm_layout_signal_emit(data, "elm,button,next", "elm");
355 eo_event_callback_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL); 332 eo_event_callback_call(data, ELM_PLAYER_EVENT_NEXT_CLICKED, NULL);
356
357 return EINA_TRUE;
358} 333}
359 334
360static Eina_Bool 335static void
361_pause(void *data, const Eo_Event *event EINA_UNUSED) 336_pause(void *data, const Eo_Event *event EINA_UNUSED)
362{ 337{
363 ELM_PLAYER_DATA_GET(data, sd); 338 ELM_PLAYER_DATA_GET(data, sd);
@@ -365,11 +340,9 @@ _pause(void *data, const Eo_Event *event EINA_UNUSED)
365 elm_layout_signal_emit(data, "elm,player,pause", "elm"); 340 elm_layout_signal_emit(data, "elm,player,pause", "elm");
366 elm_video_pause(sd->video); 341 elm_video_pause(sd->video);
367 eo_event_callback_call(data, ELM_PLAYER_EVENT_PAUSE_CLICKED, NULL); 342 eo_event_callback_call(data, ELM_PLAYER_EVENT_PAUSE_CLICKED, NULL);
368
369 return EINA_TRUE;
370} 343}
371 344
372static Eina_Bool 345static void
373_play(void *data, const Eo_Event *event EINA_UNUSED) 346_play(void *data, const Eo_Event *event EINA_UNUSED)
374{ 347{
375 ELM_PLAYER_DATA_GET(data, sd); 348 ELM_PLAYER_DATA_GET(data, sd);
@@ -377,20 +350,16 @@ _play(void *data, const Eo_Event *event EINA_UNUSED)
377 elm_layout_signal_emit(data, "elm,player,play", "elm"); 350 elm_layout_signal_emit(data, "elm,player,play", "elm");
378 elm_video_play(sd->video); 351 elm_video_play(sd->video);
379 eo_event_callback_call(data, ELM_PLAYER_EVENT_PLAY_CLICKED, NULL); 352 eo_event_callback_call(data, ELM_PLAYER_EVENT_PLAY_CLICKED, NULL);
380
381 return EINA_TRUE;
382} 353}
383 354
384static Eina_Bool 355static void
385_prev(void *data, const Eo_Event *event EINA_UNUSED) 356_prev(void *data, const Eo_Event *event EINA_UNUSED)
386{ 357{
387 eo_event_callback_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL); 358 eo_event_callback_call(data, ELM_PLAYER_EVENT_PREV_CLICKED, NULL);
388 elm_layout_signal_emit(data, "elm,button,prev", "elm"); 359 elm_layout_signal_emit(data, "elm,button,prev", "elm");
389
390 return EINA_TRUE;
391} 360}
392 361
393static Eina_Bool 362static void
394_rewind(void *data, const Eo_Event *event EINA_UNUSED) 363_rewind(void *data, const Eo_Event *event EINA_UNUSED)
395{ 364{
396 double pos; 365 double pos;
@@ -403,20 +372,16 @@ _rewind(void *data, const Eo_Event *event EINA_UNUSED)
403 372
404 elm_layout_signal_emit(data, "elm,button,rewind", "elm"); 373 elm_layout_signal_emit(data, "elm,button,rewind", "elm");
405 eo_event_callback_call(data, ELM_PLAYER_EVENT_REWIND_CLICKED, NULL); 374 eo_event_callback_call(data, ELM_PLAYER_EVENT_REWIND_CLICKED, NULL);
406
407 return EINA_TRUE;
408} 375}
409 376
410static Eina_Bool 377static void
411_stop(void *data, const Eo_Event *event EINA_UNUSED) 378_stop(void *data, const Eo_Event *event EINA_UNUSED)
412{ 379{
413 elm_layout_signal_emit(data, "elm,button,stop", "elm"); 380 elm_layout_signal_emit(data, "elm,button,stop", "elm");
414 eo_event_callback_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL); 381 eo_event_callback_call(data, ELM_PLAYER_EVENT_QUALITY_CLICKED, NULL);
415
416 return EINA_TRUE;
417} 382}
418 383
419static Eina_Bool 384static void
420_eject(void *data, const Eo_Event *event EINA_UNUSED) 385_eject(void *data, const Eo_Event *event EINA_UNUSED)
421{ 386{
422 ELM_PLAYER_DATA_GET(data, sd); 387 ELM_PLAYER_DATA_GET(data, sd);
@@ -424,8 +389,6 @@ _eject(void *data, const Eo_Event *event EINA_UNUSED)
424 elm_layout_signal_emit(data, "elm,button,eject", "elm"); 389 elm_layout_signal_emit(data, "elm,button,eject", "elm");
425 emotion_object_eject(elm_video_emotion_get(sd->video)); 390 emotion_object_eject(elm_video_emotion_get(sd->video));
426 eo_event_callback_call(data, ELM_PLAYER_EVENT_EJECT_CLICKED, NULL); 391 eo_event_callback_call(data, ELM_PLAYER_EVENT_EJECT_CLICKED, NULL);
427
428 return EINA_TRUE;
429} 392}
430 393
431static void 394static void
@@ -445,40 +408,32 @@ _mute_toggle(Evas_Object *obj)
445 } 408 }
446} 409}
447 410
448static Eina_Bool 411static void
449_volume(void *data, const Eo_Event *event EINA_UNUSED) 412_volume(void *data, const Eo_Event *event EINA_UNUSED)
450{ 413{
451 elm_layout_signal_emit(data, "elm,button,volume", "elm"); 414 elm_layout_signal_emit(data, "elm,button,volume", "elm");
452 _mute_toggle(data); 415 _mute_toggle(data);
453 eo_event_callback_call(data, ELM_PLAYER_EVENT_VOLUME_CLICKED, NULL); 416 eo_event_callback_call(data, ELM_PLAYER_EVENT_VOLUME_CLICKED, NULL);
454
455 return EINA_TRUE;
456} 417}
457 418
458static Eina_Bool 419static void
459_mute(void *data, const Eo_Event *event EINA_UNUSED) 420_mute(void *data, const Eo_Event *event EINA_UNUSED)
460{ 421{
461 elm_layout_signal_emit(data, "elm,button,mute", "elm"); 422 elm_layout_signal_emit(data, "elm,button,mute", "elm");
462 _mute_toggle(data); 423 _mute_toggle(data);
463 eo_event_callback_call(data, ELM_PLAYER_EVENT_MUTE_CLICKED, NULL); 424 eo_event_callback_call(data, ELM_PLAYER_EVENT_MUTE_CLICKED, NULL);
464
465 return EINA_TRUE;
466} 425}
467 426
468static Eina_Bool 427static void
469_play_started(void *data, const Eo_Event *event EINA_UNUSED) 428_play_started(void *data, const Eo_Event *event EINA_UNUSED)
470{ 429{
471 elm_layout_signal_emit(data, "elm,player,play", "elm"); 430 elm_layout_signal_emit(data, "elm,player,play", "elm");
472
473 return EINA_TRUE;
474} 431}
475 432
476static Eina_Bool 433static void
477_play_finished(void *data, const Eo_Event *event EINA_UNUSED) 434_play_finished(void *data, const Eo_Event *event EINA_UNUSED)
478{ 435{
479 elm_layout_signal_emit(data, "elm,player,pause", "elm"); 436 elm_layout_signal_emit(data, "elm,player,pause", "elm");
480
481 return EINA_TRUE;
482} 437}
483 438
484static void 439static void
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 97d8c5b11b..7e2861f777 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -49,13 +49,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
49static Eina_Bool _key_action_move(Evas_Object *obj, const char *params); 49static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
50static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params); 50static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params);
51static void _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED); 51static void _parent_geom_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED);
52static Eina_Bool 52static void _block_clicked_cb(void *data, const Eo_Event *event);
53_block_clicked_cb(void *data, const Eo_Event *event); 53static void _timeout_cb(void *data, const Eo_Event *event);
54static Eina_Bool
55_timeout_cb(void *data, const Eo_Event *event);
56 54
57static Eina_Bool 55static void _hide_effect_finished_cb(void *data, const Eo_Event *event);
58_hide_effect_finished_cb(void *data, const Eo_Event *event);
59 56
60static const Elm_Action key_actions[] = { 57static const Elm_Action key_actions[] = {
61 {"move", _key_action_move}, 58 {"move", _key_action_move},
@@ -104,29 +101,23 @@ _visuals_set(Evas_Object *obj)
104 edje_object_message_signal_process(elm_layout_edje_get(sd->main_layout)); 101 edje_object_message_signal_process(elm_layout_edje_get(sd->main_layout));
105} 102}
106 103
107static Eina_Bool 104static void
108_block_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 105_block_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
109{ 106{
110 eo_event_callback_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL); 107 eo_event_callback_call(data, ELM_POPUP_EVENT_BLOCK_CLICKED, NULL);
111
112 return EINA_TRUE;
113} 108}
114 109
115static Eina_Bool 110static void
116_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED) 111_timeout_cb(void *data, const Eo_Event *event EINA_UNUSED)
117{ 112{
118 evas_object_hide(data); 113 evas_object_hide(data);
119 eo_event_callback_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL); 114 eo_event_callback_call(data, ELM_POPUP_EVENT_TIMEOUT, NULL);
120
121 return EINA_TRUE;
122} 115}
123 116
124static Eina_Bool 117static void
125_hide_effect_finished_cb(void *data, const Eo_Event *event EINA_UNUSED) 118_hide_effect_finished_cb(void *data, const Eo_Event *event EINA_UNUSED)
126{ 119{
127 eo_event_callback_call(data, ELM_POPUP_EVENT_DISMISSED, NULL); 120 eo_event_callback_call(data, ELM_POPUP_EVENT_DISMISSED, NULL);
128
129 return EINA_TRUE;
130} 121}
131 122
132 123
@@ -895,24 +886,20 @@ _elm_popup_item_elm_widget_item_signal_emit(Eo *eo_it EINA_UNUSED, Elm_Popup_Ite
895 elm_layout_signal_emit(VIEW(it), emission, source); 886 elm_layout_signal_emit(VIEW(it), emission, source);
896} 887}
897 888
898static Eina_Bool 889static void
899_item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED) 890_item_focused_cb(void *data, const Eo_Event *event EINA_UNUSED)
900{ 891{
901 Elm_Popup_Item_Data *it = data; 892 Elm_Popup_Item_Data *it = data;
902 893
903 eo_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_FOCUSED, EO_OBJ(it)); 894 eo_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_FOCUSED, EO_OBJ(it));
904
905 return EINA_TRUE;
906} 895}
907 896
908static Eina_Bool 897static void
909_item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED) 898_item_unfocused_cb(void *data, const Eo_Event *event EINA_UNUSED)
910{ 899{
911 Elm_Popup_Item_Data *it = data; 900 Elm_Popup_Item_Data *it = data;
912 901
913 eo_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_UNFOCUSED, EO_OBJ(it)); 902 eo_event_callback_call(WIDGET(it), ELM_POPUP_EVENT_ITEM_UNFOCUSED, EO_OBJ(it));
914
915 return EINA_TRUE;
916} 903}
917 904
918EOLIAN static Eo * 905EOLIAN static Eo *
diff --git a/src/lib/elementary/elm_app_server.c b/src/lib/elementary/elm_app_server.c
index 4899388846..2c426cb24a 100644
--- a/src/lib/elementary/elm_app_server.c
+++ b/src/lib/elementary/elm_app_server.c
@@ -28,12 +28,11 @@ typedef struct
28 } image_raw; 28 } image_raw;
29} Elm_App_Server_Data; 29} Elm_App_Server_Data;
30 30
31static Eina_Bool 31static void
32_view_del_cb(void *data, const Eo_Event *event) 32_view_del_cb(void *data, const Eo_Event *event)
33{ 33{
34 Elm_App_Server_Data *cdata = data; 34 Elm_App_Server_Data *cdata = data;
35 eina_hash_del(cdata->views, NULL, event->object); 35 eina_hash_del(cdata->views, NULL, event->object);
36 return EINA_TRUE;
37} 36}
38 37
39static Eina_Bool 38static Eina_Bool
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index c49568d1df..caf2c39bb4 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -115,17 +115,17 @@ static Eo *_instance;
115static int _init_count = 0; 115static int _init_count = 0;
116 116
117// Object Event handlers 117// Object Event handlers
118static Eina_Bool _state_changed_signal_send(void *data, const Eo_Event *event); 118static void _state_changed_signal_send(void *data, const Eo_Event *event);
119static Eina_Bool _property_changed_signal_send(void *data, const Eo_Event *event); 119static void _property_changed_signal_send(void *data, const Eo_Event *event);
120static Eina_Bool _children_changed_signal_send(void *data, const Eo_Event *event); 120static void _children_changed_signal_send(void *data, const Eo_Event *event);
121static Eina_Bool _window_signal_send(void *data, const Eo_Event *event); 121static void _window_signal_send(void *data, const Eo_Event *event);
122static Eina_Bool _visible_data_changed_signal_send(void *data, const Eo_Event *event); 122static void _visible_data_changed_signal_send(void *data, const Eo_Event *event);
123static Eina_Bool _active_descendant_changed_signal_send(void *data, const Eo_Event *event); 123static void _active_descendant_changed_signal_send(void *data, const Eo_Event *event);
124static Eina_Bool _selection_signal_send(void *data, const Eo_Event *event); 124static void _selection_signal_send(void *data, const Eo_Event *event);
125static Eina_Bool _text_text_inserted_send(void *data, const Eo_Event *event); 125static void _text_text_inserted_send(void *data, const Eo_Event *event);
126static Eina_Bool _text_text_removed_send(void *data, const Eo_Event *event); 126static void _text_text_removed_send(void *data, const Eo_Event *event);
127static Eina_Bool _text_caret_moved_send(void *data, const Eo_Event *event); 127static void _text_caret_moved_send(void *data, const Eo_Event *event);
128static Eina_Bool _text_selection_changed_send(void *data, const Eo_Event *event); 128static void _text_selection_changed_send(void *data, const Eo_Event *event);
129 129
130// bridge private methods 130// bridge private methods
131static void _bridge_object_register(Eo *bridge, Eo *obj); 131static void _bridge_object_register(Eo *bridge, Eo *obj);
@@ -139,8 +139,8 @@ static void _bridge_iter_object_reference_append(Eo *bridge, Eldbus_Message_Iter
139static void _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj); 139static void _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj);
140static Eina_Bool _elm_atspi_bridge_key_filter(void *data, void *loop, int type, void *event); 140static Eina_Bool _elm_atspi_bridge_key_filter(void *data, void *loop, int type, void *event);
141static void _object_desktop_reference_append(Eldbus_Message_Iter *iter); 141static void _object_desktop_reference_append(Eldbus_Message_Iter *iter);
142static Eina_Bool _on_object_add(void *data, const Eo_Event *event); 142static void _on_object_add(void *data, const Eo_Event *event);
143static Eina_Bool _on_object_del(void *data, const Eo_Event *event); 143static void _on_object_del(void *data, const Eo_Event *event);
144 144
145typedef struct { 145typedef struct {
146 const Eo_Event_Description *desc; 146 const Eo_Event_Description *desc;
@@ -3799,35 +3799,40 @@ _handle_listener_change(void *data, const Eldbus_Message *msg EINA_UNUSED)
3799 _registered_events_list_update(data); 3799 _registered_events_list_update(data);
3800} 3800}
3801 3801
3802static Eina_Bool 3802static void
3803_state_changed_signal_send(void *data, const Eo_Event *event) 3803_state_changed_signal_send(void *data, const Eo_Event *event)
3804{ 3804{
3805 Elm_Atspi_Event_State_Changed_Data *state_data = event->info; 3805 Elm_Atspi_Event_State_Changed_Data *state_data = event->info;
3806 const char *type_desc; 3806 const char *type_desc;
3807 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3807 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
3808 3808
3809 if (!STATE_TYPE_GET(pd->object_state_broadcast_mask, state_data->type)) 3809 if (!STATE_TYPE_GET(pd->object_state_broadcast_mask, state_data->type))
3810 return EINA_FALSE; 3810 {
3811 eo_event_callback_stop(event->object);
3812 return;
3813 }
3811 3814
3812 if ((state_data->type > ELM_ATSPI_STATE_LAST_DEFINED) || 3815 if ((state_data->type > ELM_ATSPI_STATE_LAST_DEFINED) ||
3813 (int)state_data->type < 0) 3816 (int)state_data->type < 0)
3814 return EINA_FALSE; 3817 {
3818 eo_event_callback_stop(event->object);
3819 return;
3820 }
3815 3821
3816 type_desc = elm_states_to_atspi_state[state_data->type].name; 3822 type_desc = elm_states_to_atspi_state[state_data->type].name;
3817 3823
3818 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3824 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3819 &_event_obj_signals[ATSPI_OBJECT_EVENT_STATE_CHANGED], type_desc, state_data->new_value, 0, NULL); 3825 &_event_obj_signals[ATSPI_OBJECT_EVENT_STATE_CHANGED], type_desc, state_data->new_value, 0, NULL);
3820 return EINA_TRUE;
3821} 3826}
3822 3827
3823static Eina_Bool 3828static void
3824_property_changed_signal_send(void *data, const Eo_Event *event) 3829_property_changed_signal_send(void *data, const Eo_Event *event)
3825{ 3830{
3826 const char *property = event->info; 3831 const char *property = event->info;
3827 char *atspi_desc; 3832 char *atspi_desc;
3828 enum _Atspi_Object_Property prop = ATSPI_OBJECT_PROPERTY_LAST; 3833 enum _Atspi_Object_Property prop = ATSPI_OBJECT_PROPERTY_LAST;
3829 3834
3830 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3835 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
3831 3836
3832 if (!strcmp(property, "parent")) 3837 if (!strcmp(property, "parent"))
3833 { 3838 {
@@ -3857,54 +3862,58 @@ _property_changed_signal_send(void *data, const Eo_Event *event)
3857 if (prop == ATSPI_OBJECT_PROPERTY_LAST) 3862 if (prop == ATSPI_OBJECT_PROPERTY_LAST)
3858 { 3863 {
3859 ERR("Unrecognized property name!"); 3864 ERR("Unrecognized property name!");
3860 return EINA_FALSE; 3865 eo_event_callback_stop(event->object);
3866 return;
3861 } 3867 }
3862 if (!STATE_TYPE_GET(pd->object_property_broadcast_mask, prop)) 3868 if (!STATE_TYPE_GET(pd->object_property_broadcast_mask, prop))
3863 { 3869 {
3864 DBG("Masking property %s changed event.", property); 3870 DBG("Masking property %s changed event.", property);
3865 return EINA_FALSE; 3871 eo_event_callback_stop(event->object);
3872 return;
3866 } 3873 }
3867 3874
3868 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3875 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3869 &_event_obj_signals[ATSPI_OBJECT_EVENT_PROPERTY_CHANGED], atspi_desc, 0, 0, NULL, NULL); 3876 &_event_obj_signals[ATSPI_OBJECT_EVENT_PROPERTY_CHANGED], atspi_desc, 0, 0, NULL, NULL);
3870 return EINA_TRUE;
3871} 3877}
3872 3878
3873static Eina_Bool 3879static void
3874_visible_data_changed_signal_send(void *data, const Eo_Event *event) 3880_visible_data_changed_signal_send(void *data, const Eo_Event *event)
3875{ 3881{
3876 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3882 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
3877 3883
3878 if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED)) 3884 if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED))
3879 return EINA_FALSE; 3885 {
3886 eo_event_callback_stop(event->object);
3887 return;
3888 }
3880 3889
3881 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3890 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3882 &_event_obj_signals[ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED], "", 3891 &_event_obj_signals[ATSPI_OBJECT_EVENT_VISIBLE_DATA_CHANGED], "",
3883 0, 0, NULL, NULL); 3892 0, 0, NULL, NULL);
3884
3885 return EINA_TRUE;
3886} 3893}
3887 3894
3888static Eina_Bool 3895static void
3889_active_descendant_changed_signal_send(void *data, const Eo_Event *event) 3896_active_descendant_changed_signal_send(void *data, const Eo_Event *event)
3890{ 3897{
3891 Eo *child = event->info; 3898 Eo *child = event->info;
3892 int idx; 3899 int idx;
3893 3900
3894 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3901 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
3895 3902
3896 if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED)) 3903 if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED))
3897 return EINA_FALSE; 3904 {
3905 eo_event_callback_stop(event->object);
3906 return;
3907 }
3898 3908
3899 idx = elm_interface_atspi_accessible_index_in_parent_get(child); 3909 idx = elm_interface_atspi_accessible_index_in_parent_get(child);
3900 3910
3901 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3911 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3902 &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "", 3912 &_event_obj_signals[ATSPI_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED], "",
3903 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), child); 3913 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), child);
3904 return EINA_TRUE;
3905} 3914}
3906 3915
3907static Eina_Bool 3916static void
3908_children_changed_signal_send(void *data, const Eo_Event *event) 3917_children_changed_signal_send(void *data, const Eo_Event *event)
3909{ 3918{
3910 const char *atspi_desc = NULL; 3919 const char *atspi_desc = NULL;
@@ -3912,12 +3921,15 @@ _children_changed_signal_send(void *data, const Eo_Event *event)
3912 int idx; 3921 int idx;
3913 enum _Atspi_Object_Child_Event_Type type; 3922 enum _Atspi_Object_Child_Event_Type type;
3914 3923
3915 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3924 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
3916 3925
3917 type = ev_data->is_added ? ATSPI_OBJECT_CHILD_ADDED : ATSPI_OBJECT_CHILD_REMOVED; 3926 type = ev_data->is_added ? ATSPI_OBJECT_CHILD_ADDED : ATSPI_OBJECT_CHILD_REMOVED;
3918 3927
3919 if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, type)) 3928 if (!STATE_TYPE_GET(pd->object_children_broadcast_mask, type))
3920 return EINA_FALSE; 3929 {
3930 eo_event_callback_stop(event->object);
3931 return;
3932 }
3921 3933
3922 switch (type) 3934 switch (type)
3923 { 3935 {
@@ -3931,21 +3943,23 @@ _children_changed_signal_send(void *data, const Eo_Event *event)
3931 break; 3943 break;
3932 } 3944 }
3933 3945
3934 if (!atspi_desc) return EINA_FALSE; 3946 if (!atspi_desc)
3947 {
3948 eo_event_callback_stop(event->object);
3949 return;
3950 }
3935 3951
3936 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 3952 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3937 &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc, 3953 &_event_obj_signals[ATSPI_OBJECT_EVENT_CHILDREN_CHANGED], atspi_desc,
3938 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child); 3954 idx, 0, "(so)", eldbus_connection_unique_name_get(pd->a11y_bus), ev_data->child);
3939
3940 return EINA_TRUE;
3941} 3955}
3942 3956
3943static Eina_Bool 3957static void
3944_window_signal_send(void *data, const Eo_Event *event) 3958_window_signal_send(void *data, const Eo_Event *event)
3945{ 3959{
3946 enum _Atspi_Window_Signals type; 3960 enum _Atspi_Window_Signals type;
3947 3961
3948 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 3962 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
3949 3963
3950 if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_CREATED) 3964 if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_CREATED)
3951 type = ATSPI_WINDOW_EVENT_CREATE; 3965 type = ATSPI_WINDOW_EVENT_CREATE;
@@ -3962,33 +3976,41 @@ _window_signal_send(void *data, const Eo_Event *event)
3962 else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED) 3976 else if (event->desc == ELM_INTERFACE_ATSPI_WINDOW_EVENT_WINDOW_RESTORED)
3963 type = ATSPI_WINDOW_EVENT_RESTORE; 3977 type = ATSPI_WINDOW_EVENT_RESTORE;
3964 else 3978 else
3965 return EINA_FALSE; 3979 {
3980 eo_event_callback_stop(event->object);
3981 return;
3982 }
3966 3983
3967 if (!STATE_TYPE_GET(pd->window_signal_broadcast_mask, type)) 3984 if (!STATE_TYPE_GET(pd->window_signal_broadcast_mask, type))
3968 return EINA_FALSE; 3985 {
3986 eo_event_callback_stop(event->object);
3987 return;
3988 }
3969 3989
3970 if (!pd->a11y_bus) 3990 if (!pd->a11y_bus)
3971 { 3991 {
3972 ERR("A11Y connection closed. Unable to send ATSPI event."); 3992 ERR("A11Y connection closed. Unable to send ATSPI event.");
3973 return EINA_FALSE; 3993 eo_event_callback_stop(event->object);
3994 return;
3974 } 3995 }
3975 3996
3976 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_WINDOW, 3997 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_WINDOW,
3977 &_window_obj_signals[type], "", 0, 0, "i", 0); 3998 &_window_obj_signals[type], "", 0, 0, "i", 0);
3978 return EINA_TRUE;
3979} 3999}
3980 4000
3981static Eina_Bool 4001static void
3982_selection_signal_send(void *data, const Eo_Event *event) 4002_selection_signal_send(void *data, const Eo_Event *event)
3983{ 4003{
3984 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4004 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
3985 4005
3986 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_SELECTION_CHANGED)) 4006 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_SELECTION_CHANGED))
3987 return EINA_FALSE; 4007 {
4008 eo_event_callback_stop(event->object);
4009 return;
4010 }
3988 4011
3989 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4012 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
3990 &_event_obj_signals[ATSPI_OBJECT_EVENT_SELECTION_CHANGED], "", 0, 0, "i", 0); 4013 &_event_obj_signals[ATSPI_OBJECT_EVENT_SELECTION_CHANGED], "", 0, 0, "i", 0);
3991 return EINA_TRUE;
3992} 4014}
3993 4015
3994static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eldbus_Signal *signal, const char *minor, unsigned int det1, unsigned int det2, const char *variant_sig, ...) 4016static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eldbus_Signal *signal, const char *minor, unsigned int det1, unsigned int det2, const char *variant_sig, ...)
@@ -4074,68 +4096,60 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld
4074 DBG("Send %s.%s[%s,%d,%d]", infc, signal->name, minor, det1, det2); 4096 DBG("Send %s.%s[%s,%d,%d]", infc, signal->name, minor, det1, det2);
4075} 4097}
4076 4098
4077static Eina_Bool 4099static void
4078_text_caret_moved_send(void *data, const Eo_Event *event) 4100_text_caret_moved_send(void *data, const Eo_Event *event)
4079{ 4101{
4080 int cursor_pos = 0; 4102 int cursor_pos = 0;
4081 4103
4082 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_FALSE); 4104 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4083 4105
4084 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED)) 4106 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED))
4085 return EINA_TRUE; 4107 return;
4086 4108
4087 cursor_pos = elm_interface_atspi_text_caret_offset_get(event->object); 4109 cursor_pos = elm_interface_atspi_text_caret_offset_get(event->object);
4088 4110
4089 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4111 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4090 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL); 4112 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CARET_MOVED], "", cursor_pos, 0, NULL, NULL);
4091
4092 return EINA_TRUE;
4093} 4113}
4094 4114
4095static Eina_Bool 4115static void
4096_text_text_inserted_send(void *data, const Eo_Event *event) 4116_text_text_inserted_send(void *data, const Eo_Event *event)
4097{ 4117{
4098 Elm_Atspi_Text_Change_Info *info = event->info; 4118 Elm_Atspi_Text_Change_Info *info = event->info;
4099 4119
4100 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4120 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4101 4121
4102 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED)) 4122 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED))
4103 return EINA_TRUE; 4123 return;
4104 4124
4105 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4125 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4106 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "insert", info->pos, info->len, "s", info->content); 4126 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "insert", info->pos, info->len, "s", info->content);
4107
4108 return EINA_TRUE;
4109} 4127}
4110 4128
4111static Eina_Bool 4129static void
4112_text_text_removed_send(void *data, const Eo_Event *event) 4130_text_text_removed_send(void *data, const Eo_Event *event)
4113{ 4131{
4114 Elm_Atspi_Text_Change_Info *info = event->info; 4132 Elm_Atspi_Text_Change_Info *info = event->info;
4115 4133
4116 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4134 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4117 4135
4118 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED)) 4136 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_CHANGED))
4119 return EINA_TRUE; 4137 return;
4120 4138
4121 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4139 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4122 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "delete", info->pos, info->len, "s", info->content); 4140 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_CHANGED], "delete", info->pos, info->len, "s", info->content);
4123
4124 return EINA_TRUE;
4125} 4141}
4126 4142
4127static Eina_Bool 4143static void
4128_text_selection_changed_send(void *data, const Eo_Event *event) 4144_text_selection_changed_send(void *data, const Eo_Event *event)
4129{ 4145{
4130 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4146 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4131 4147
4132 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED)) 4148 if (!STATE_TYPE_GET(pd->object_broadcast_mask, ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED))
4133 return EINA_TRUE; 4149 return;
4134 4150
4135 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT, 4151 _bridge_signal_send(data, event->object, ATSPI_DBUS_INTERFACE_EVENT_OBJECT,
4136 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED], "", 0, 0, NULL, NULL); 4152 &_event_obj_signals[ATSPI_OBJECT_EVENT_TEXT_SELECTION_CHANGED], "", 0, 0, NULL, NULL);
4137
4138 return EINA_TRUE;
4139} 4153}
4140 4154
4141static void 4155static void
@@ -4160,29 +4174,27 @@ _bridge_object_unregister(Eo *bridge, Eo *obj)
4160 eina_hash_del(pd->cache, &obj, obj); 4174 eina_hash_del(pd->cache, &obj, obj);
4161} 4175}
4162 4176
4163static Eina_Bool 4177static void
4164_on_object_add(void *data, const Eo_Event *event) 4178_on_object_add(void *data, const Eo_Event *event)
4165{ 4179{
4166 Eldbus_Message *sig; 4180 Eldbus_Message *sig;
4167 Eldbus_Message_Iter *iter; 4181 Eldbus_Message_Iter *iter;
4168 4182
4169 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4183 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4170 4184
4171 sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_ADDED); 4185 sig = eldbus_service_signal_new(pd->cache_interface, ATSPI_OBJECT_CHILD_ADDED);
4172 iter = eldbus_message_iter_get(sig); 4186 iter = eldbus_message_iter_get(sig);
4173 _cache_item_reference_append_cb(data, event->object, iter); 4187 _cache_item_reference_append_cb(data, event->object, iter);
4174 4188
4175 eldbus_service_signal_send(pd->cache_interface, sig); 4189 eldbus_service_signal_send(pd->cache_interface, sig);
4176
4177 return EINA_TRUE;
4178} 4190}
4179 4191
4180static Eina_Bool 4192static void
4181_on_object_del(void *data, const Eo_Event *event) 4193_on_object_del(void *data, const Eo_Event *event)
4182{ 4194{
4183 Eldbus_Message *sig; 4195 Eldbus_Message *sig;
4184 4196
4185 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4197 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4186 4198
4187 _bridge_object_unregister(data, event->object); 4199 _bridge_object_unregister(data, event->object);
4188 4200
@@ -4190,8 +4202,6 @@ _on_object_del(void *data, const Eo_Event *event)
4190 Eldbus_Message_Iter *iter = eldbus_message_iter_get(sig); 4202 Eldbus_Message_Iter *iter = eldbus_message_iter_get(sig);
4191 _bridge_iter_object_reference_append(data, iter, event->object); 4203 _bridge_iter_object_reference_append(data, iter, event->object);
4192 eldbus_service_signal_send(pd->cache_interface, sig); 4204 eldbus_service_signal_send(pd->cache_interface, sig);
4193
4194 return EINA_TRUE;
4195} 4205}
4196 4206
4197static void 4207static void
@@ -4315,10 +4325,10 @@ _interfaces_register(Eo *bridge)
4315 eldbus_service_object_data_set(pd->interfaces.value, ELM_ATSPI_BRIDGE_CLASS_NAME, bridge); 4325 eldbus_service_object_data_set(pd->interfaces.value, ELM_ATSPI_BRIDGE_CLASS_NAME, bridge);
4316} 4326}
4317 4327
4318static Eina_Bool 4328static void
4319_bridge_accessible_event_dispatch(void *data, const Eo_Event *event) 4329_bridge_accessible_event_dispatch(void *data, const Eo_Event *event)
4320{ 4330{
4321 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(data, pd, EINA_TRUE); 4331 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(data, pd);
4322 4332
4323 _bridge_object_register(data, event->object); 4333 _bridge_object_register(data, event->object);
4324 4334
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 816fac982a..cbba1960b9 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -29,24 +29,20 @@ _elm_box_list_data_get(const Eina_List *list)
29 return opt->obj; 29 return opt->obj;
30} 30}
31 31
32static Eina_Bool 32static void
33_child_added_cb_proxy(void *data, const Eo_Event *event) 33_child_added_cb_proxy(void *data, const Eo_Event *event)
34{ 34{
35 Evas_Object *box = data; 35 Evas_Object *box = data;
36 Evas_Object_Box_Option *opt = event->info; 36 Evas_Object_Box_Option *opt = event->info;
37 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj); 37 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_ADDED, opt->obj);
38
39 return EINA_TRUE;
40} 38}
41 39
42static Eina_Bool 40static void
43_child_removed_cb_proxy(void *data, const Eo_Event *event) 41_child_removed_cb_proxy(void *data, const Eo_Event *event)
44{ 42{
45 Evas_Object *box = data; 43 Evas_Object *box = data;
46 Evas_Object *child = event->info; 44 Evas_Object *child = event->info;
47 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child); 45 eo_event_callback_call(box, ELM_BOX_EVENT_CHILD_REMOVED, child);
48
49 return EINA_TRUE;
50} 46}
51 47
52EOLIAN static Eina_Bool 48EOLIAN static Eina_Bool
@@ -193,7 +189,7 @@ _transition_animation(void *data)
193 return ECORE_CALLBACK_RENEW; 189 return ECORE_CALLBACK_RENEW;
194} 190}
195 191
196static Eina_Bool 192static void
197_transition_layout_child_added(void *data, const Eo_Event *event) 193_transition_layout_child_added(void *data, const Eo_Event *event)
198{ 194{
199 Transition_Animation_Data *tad; 195 Transition_Animation_Data *tad;
@@ -201,16 +197,14 @@ _transition_layout_child_added(void *data, const Eo_Event *event)
201 Elm_Box_Transition *layout_data = data; 197 Elm_Box_Transition *layout_data = data;
202 198
203 tad = calloc(1, sizeof(Transition_Animation_Data)); 199 tad = calloc(1, sizeof(Transition_Animation_Data));
204 if (!tad) return EINA_TRUE; 200 if (!tad) return;
205 201
206 tad->obj = opt->obj; 202 tad->obj = opt->obj;
207 layout_data->objs = eina_list_append(layout_data->objs, tad); 203 layout_data->objs = eina_list_append(layout_data->objs, tad);
208 layout_data->recalculate = EINA_TRUE; 204 layout_data->recalculate = EINA_TRUE;
209
210 return EINA_TRUE;
211} 205}
212 206
213static Eina_Bool 207static void
214_transition_layout_child_removed(void *data, const Eo_Event *event) 208_transition_layout_child_removed(void *data, const Eo_Event *event)
215{ 209{
216 Eina_List *l; 210 Eina_List *l;
@@ -227,8 +221,6 @@ _transition_layout_child_removed(void *data, const Eo_Event *event)
227 break; 221 break;
228 } 222 }
229 } 223 }
230
231 return EINA_TRUE;
232} 224}
233 225
234static void 226static void
diff --git a/src/lib/elementary/elm_cnp.c b/src/lib/elementary/elm_cnp.c
index eafdffc411..d261a7488b 100644
--- a/src/lib/elementary/elm_cnp.c
+++ b/src/lib/elementary/elm_cnp.c
@@ -1771,13 +1771,12 @@ _x11_dnd_status(void *data EINA_UNUSED, int etype EINA_UNUSED, void *ev)
1771 return EINA_TRUE; 1771 return EINA_TRUE;
1772} 1772}
1773 1773
1774static Eina_Bool 1774static void
1775_x11_win_rotation_changed_cb(void *data, const Eo_Event *event) 1775_x11_win_rotation_changed_cb(void *data, const Eo_Event *event)
1776{ 1776{
1777 Evas_Object *win = data; 1777 Evas_Object *win = data;
1778 int rot = elm_win_rotation_get(event->object); 1778 int rot = elm_win_rotation_get(event->object);
1779 elm_win_rotation_set(win, rot); 1779 elm_win_rotation_set(win, rot);
1780 return EINA_TRUE;
1781} 1780}
1782 1781
1783static Eina_Bool 1782static Eina_Bool
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c
index 7deac92bca..d31c667a68 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -448,7 +448,7 @@ _elm_code_widget_fill(Elm_Code_Widget *widget)
448 _elm_code_widget_fill_range(widget, 1, elm_code_file_lines_get(pd->code->file), NULL); 448 _elm_code_widget_fill_range(widget, 1, elm_code_file_lines_get(pd->code->file), NULL);
449} 449}
450 450
451static Eina_Bool 451static void
452_elm_code_widget_line_cb(void *data, const Eo_Event *event) 452_elm_code_widget_line_cb(void *data, const Eo_Event *event)
453{ 453{
454 Elm_Code_Line *line; 454 Elm_Code_Line *line;
@@ -458,11 +458,9 @@ _elm_code_widget_line_cb(void *data, const Eo_Event *event)
458 widget = (Elm_Code_Widget *)data; 458 widget = (Elm_Code_Widget *)data;
459 459
460 _elm_code_widget_refresh(widget, line); 460 _elm_code_widget_refresh(widget, line);
461
462 return EO_CALLBACK_CONTINUE;
463} 461}
464 462
465static Eina_Bool 463static void
466_elm_code_widget_file_cb(void *data, const Eo_Event *event EINA_UNUSED) 464_elm_code_widget_file_cb(void *data, const Eo_Event *event EINA_UNUSED)
467{ 465{
468 Elm_Code_Widget *widget; 466 Elm_Code_Widget *widget;
@@ -470,10 +468,9 @@ _elm_code_widget_file_cb(void *data, const Eo_Event *event EINA_UNUSED)
470 widget = (Elm_Code_Widget *)data; 468 widget = (Elm_Code_Widget *)data;
471 469
472 _elm_code_widget_fill(widget); 470 _elm_code_widget_fill(widget);
473 return EO_CALLBACK_CONTINUE;
474} 471}
475 472
476static Eina_Bool 473static void
477_elm_code_widget_selection_cb(void *data, const Eo_Event *event EINA_UNUSED) 474_elm_code_widget_selection_cb(void *data, const Eo_Event *event EINA_UNUSED)
478{ 475{
479 Elm_Code_Widget *widget; 476 Elm_Code_Widget *widget;
@@ -481,10 +478,9 @@ _elm_code_widget_selection_cb(void *data, const Eo_Event *event EINA_UNUSED)
481 widget = (Elm_Code_Widget *)data; 478 widget = (Elm_Code_Widget *)data;
482 479
483 _elm_code_widget_refresh(widget, NULL); 480 _elm_code_widget_refresh(widget, NULL);
484 return EO_CALLBACK_CONTINUE;
485} 481}
486 482
487static Eina_Bool 483static void
488_elm_code_widget_selection_clear_cb(void *data, const Eo_Event *event EINA_UNUSED) 484_elm_code_widget_selection_clear_cb(void *data, const Eo_Event *event EINA_UNUSED)
489{ 485{
490 Elm_Code_Widget *widget; 486 Elm_Code_Widget *widget;
@@ -492,7 +488,6 @@ _elm_code_widget_selection_clear_cb(void *data, const Eo_Event *event EINA_UNUSE
492 widget = (Elm_Code_Widget *)data; 488 widget = (Elm_Code_Widget *)data;
493 489
494 _elm_code_widget_fill(widget); 490 _elm_code_widget_fill(widget);
495 return EO_CALLBACK_CONTINUE;
496} 491}
497 492
498static void 493static void
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index 02c2d25b1b..979d3e171b 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -127,7 +127,7 @@ _colorclass_select(void *data, Evas_Object *obj EINA_UNUSED, const char *sig, co
127 cc->current->color[cc->num].b, cc->current->color[cc->num].a); 127 cc->current->color[cc->num].b, cc->current->color[cc->num].a);
128} 128}
129 129
130static Eina_Bool 130static void
131_colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED) 131_colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED)
132{ 132{
133 Colorclass_UI *cc = data; 133 Colorclass_UI *cc = data;
@@ -148,16 +148,19 @@ _colorclass_changed(void *data, const Eo_Event *event EINA_UNUSED)
148 _colorclass_cc_update(cc, cc->num); 148 _colorclass_cc_update(cc, cc->num);
149 cc->change_reset = 0; 149 cc->change_reset = 0;
150 cc->changed = 1; 150 cc->changed = 1;
151 return EINA_TRUE;
152} 151}
153 152
154static Eina_Bool 153static void
155_colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED) 154_colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED)
156{ 155{
157 Colorclass_UI *cc = data; 156 Colorclass_UI *cc = data;
158 Colorclass color; 157 Colorclass color;
159 158
160 if (!cc->current) return EINA_FALSE; 159 if (!cc->current)
160 {
161 eo_event_callback_stop(event->object);
162 return;
163 }
161 //if (cc->winid && remote_iface) 164 //if (cc->winid && remote_iface)
162 //{ 165 //{
163 //Eldbus_Message *msg; 166 //Eldbus_Message *msg;
@@ -167,7 +170,8 @@ _colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED)
167 //eldbus_message_arguments_append(msg, "s", cc->current->name); 170 //eldbus_message_arguments_append(msg, "s", cc->current->name);
168 //eldbus_service_signal_send(remote_iface, msg); 171 //eldbus_service_signal_send(remote_iface, msg);
169 //cc->change_reset = 1; 172 //cc->change_reset = 1;
170 //return EINA_FALSE; 173 //eo_event_callback_stop(event->object);
174 //return;
171 //} 175 //}
172 edje_color_class_del(cc->current->name); 176 edje_color_class_del(cc->current->name);
173 edje_color_class_get(cc->current->name, 177 edje_color_class_get(cc->current->name,
@@ -186,10 +190,9 @@ _colorclass_reset(void *data, const Eo_Event *event EINA_UNUSED)
186 _colorclass_cc_update(cc, 0); 190 _colorclass_cc_update(cc, 0);
187 _colorclass_cc_update(cc, 1); 191 _colorclass_cc_update(cc, 1);
188 _colorclass_cc_update(cc, 2); 192 _colorclass_cc_update(cc, 2);
189 return EINA_TRUE;
190} 193}
191 194
192static Eina_Bool 195static void
193_colorclass_activate(void *data, const Eo_Event *event) 196_colorclass_activate(void *data, const Eo_Event *event)
194{ 197{
195 Colorclass_UI *cc = data; 198 Colorclass_UI *cc = data;
@@ -226,7 +229,6 @@ _colorclass_activate(void *data, const Eo_Event *event)
226 elm_colorselector_color_set(cc->cs, cc->current->color[0].r, cc->current->color[0].g, 229 elm_colorselector_color_set(cc->cs, cc->current->color[0].r, cc->current->color[0].g,
227 cc->current->color[0].b, cc->current->color[0].a); 230 cc->current->color[0].b, cc->current->color[0].a);
228 elm_layout_signal_emit(cc->ly, "elm,colors,show", "elm"); 231 elm_layout_signal_emit(cc->ly, "elm,colors,show", "elm");
229 return EINA_TRUE;
230} 232}
231 233
232static void 234static void
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 8de5825f0a..abda3735e9 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -634,7 +634,7 @@ _colors_set(Evas_Object *obj,
634 eo_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL); 634 eo_event_callback_call(obj, ELM_COLORSELECTOR_EVENT_CHANGED, NULL);
635} 635}
636 636
637static Eina_Bool 637static void
638_spinner_changed_cb(void *data, const Eo_Event *event) 638_spinner_changed_cb(void *data, const Eo_Event *event)
639{ 639{
640 Elm_Colorselector_Data *sd = data; 640 Elm_Colorselector_Data *sd = data;
@@ -664,8 +664,6 @@ _spinner_changed_cb(void *data, const Eo_Event *event)
664 } 664 }
665 evas_object_data_del(event->object, "_changed"); 665 evas_object_data_del(event->object, "_changed");
666 eo_event_callback_call(parent, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL); 666 eo_event_callback_call(parent, ELM_COLORSELECTOR_EVENT_CHANGED_USER, NULL);
667
668 return EINA_TRUE;
669} 667}
670 668
671#ifdef HAVE_ELEMENTARY_X 669#ifdef HAVE_ELEMENTARY_X
@@ -694,7 +692,7 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj)
694 return xwin; 692 return xwin;
695} 693}
696 694
697static Eina_Bool 695static void
698_start_grab_pick_cb(void *data, const Eo_Event *event) 696_start_grab_pick_cb(void *data, const Eo_Event *event)
699{ 697{
700 Evas_Object *o = data; 698 Evas_Object *o = data;
@@ -709,8 +707,6 @@ _start_grab_pick_cb(void *data, const Eo_Event *event)
709 707
710 ecore_x_keyboard_grab(sd->grab.xroot); 708 ecore_x_keyboard_grab(sd->grab.xroot);
711 ecore_x_pointer_grab(sd->grab.xroot); 709 ecore_x_pointer_grab(sd->grab.xroot);
712
713 return EINA_TRUE;
714} 710}
715 711
716static Eina_Bool 712static Eina_Bool
@@ -1011,7 +1007,7 @@ _colorbar_move_cb(void *data,
1011 _colorbar_arrow_set(cb_data, ev->cur.canvas.x); 1007 _colorbar_arrow_set(cb_data, ev->cur.canvas.x);
1012} 1008}
1013 1009
1014static Eina_Bool 1010static void
1015_button_clicked_cb(void *data, const Eo_Event *event) 1011_button_clicked_cb(void *data, const Eo_Event *event)
1016{ 1012{
1017 Color_Bar_Data *cb_data = data; 1013 Color_Bar_Data *cb_data = data;
@@ -1052,11 +1048,9 @@ _button_clicked_cb(void *data, const Eo_Event *event)
1052 _update_hsla_from_colorbar(cb_data->parent, cb_data->color_type, x); 1048 _update_hsla_from_colorbar(cb_data->parent, cb_data->color_type, x);
1053 sd->sel_color_type = cb_data->color_type; 1049 sd->sel_color_type = cb_data->color_type;
1054 sd->focused = ELM_COLORSELECTOR_COMPONENTS; 1050 sd->focused = ELM_COLORSELECTOR_COMPONENTS;
1055
1056 return EINA_TRUE;
1057} 1051}
1058 1052
1059static Eina_Bool 1053static void
1060_button_repeat_cb(void *data, const Eo_Event *event EINA_UNUSED) 1054_button_repeat_cb(void *data, const Eo_Event *event EINA_UNUSED)
1061{ 1055{
1062 Color_Bar_Data *cb_data = data; 1056 Color_Bar_Data *cb_data = data;
@@ -1073,8 +1067,6 @@ _button_repeat_cb(void *data, const Eo_Event *event EINA_UNUSED)
1073 1067
1074 edje_object_part_drag_value_set(cb_data->colorbar, "elm.arrow", x, y); 1068 edje_object_part_drag_value_set(cb_data->colorbar, "elm.arrow", x, y);
1075 _update_hsla_from_colorbar(cb_data->parent, cb_data->color_type, x); 1069 _update_hsla_from_colorbar(cb_data->parent, cb_data->color_type, x);
1076
1077 return EINA_TRUE;
1078} 1070}
1079 1071
1080static void 1072static void
diff --git a/src/lib/elementary/elm_conform.c b/src/lib/elementary/elm_conform.c
index 3d359b3be6..c512aa5a13 100644
--- a/src/lib/elementary/elm_conform.c
+++ b/src/lib/elementary/elm_conform.c
@@ -352,7 +352,7 @@ _land_indicator_connect_cb(void *data)
352 return ECORE_CALLBACK_RENEW; 352 return ECORE_CALLBACK_RENEW;
353} 353}
354 354
355static Eina_Bool 355static void
356_land_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED) 356_land_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED)
357{ 357{
358 Evas_Object *conform = data; 358 Evas_Object *conform = data;
@@ -361,10 +361,9 @@ _land_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED)
361 361
362 sd->land_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME, 362 sd->land_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME,
363 _land_indicator_connect_cb, conform); 363 _land_indicator_connect_cb, conform);
364 return EINA_TRUE;
365} 364}
366 365
367static Eina_Bool 366static void
368_port_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED) 367_port_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED)
369{ 368{
370 Evas_Object *conform = data; 369 Evas_Object *conform = data;
@@ -373,7 +372,6 @@ _port_indicator_disconnected(void *data, const Eo_Event *event EINA_UNUSED)
373 372
374 sd->port_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME, 373 sd->port_indi_timer = ecore_timer_add(ELM_CONFORM_INDICATOR_TIME,
375 _port_indicator_connect_cb, conform); 374 _port_indicator_connect_cb, conform);
376 return EINA_TRUE;
377} 375}
378 376
379static Evas_Object * 377static Evas_Object *
@@ -510,7 +508,7 @@ _indicator_opacity_set(Evas_Object *conformant, Elm_Win_Indicator_Opacity_Mode i
510 //TODO: opacity change 508 //TODO: opacity change
511} 509}
512 510
513static Eina_Bool 511static void
514_on_indicator_mode_changed(void *data, const Eo_Event *event) 512_on_indicator_mode_changed(void *data, const Eo_Event *event)
515{ 513{
516 Evas_Object *conformant = data; 514 Evas_Object *conformant = data;
@@ -527,10 +525,9 @@ _on_indicator_mode_changed(void *data, const Eo_Event *event)
527 _indicator_mode_set(conformant, indmode); 525 _indicator_mode_set(conformant, indmode);
528 if (ind_o_mode != sd->ind_o_mode) 526 if (ind_o_mode != sd->ind_o_mode)
529 _indicator_opacity_set(conformant, ind_o_mode); 527 _indicator_opacity_set(conformant, ind_o_mode);
530 return EINA_TRUE;
531} 528}
532 529
533static Eina_Bool 530static void
534_on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED) 531_on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED)
535{ 532{
536 int rot = 0; 533 int rot = 0;
@@ -542,12 +539,12 @@ _on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED)
542 539
543 rot = elm_win_rotation_get(win); 540 rot = elm_win_rotation_get(win);
544 541
545 if (rot == sd->rot) return EINA_TRUE; 542 if (rot == sd->rot) return;
546 543
547 sd->rot = rot; 544 sd->rot = rot;
548 old_indi = elm_layout_content_unset(conformant, INDICATOR_PART); 545 old_indi = elm_layout_content_unset(conformant, INDICATOR_PART);
549 /* this means ELM_WIN_INDICATOR_SHOW never be set.we don't need to change indicator type*/ 546 /* this means ELM_WIN_INDICATOR_SHOW never be set.we don't need to change indicator type*/
550 if (!old_indi) return EINA_TRUE; 547 if (!old_indi) return;
551 evas_object_hide(old_indi); 548 evas_object_hide(old_indi);
552 549
553 if ((rot == 90) || (rot == 270)) 550 if ((rot == 90) || (rot == 270))
@@ -555,7 +552,7 @@ _on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED)
555 if (!sd->landscape_indicator) 552 if (!sd->landscape_indicator)
556 sd->landscape_indicator = _create_landscape_indicator(conformant); 553 sd->landscape_indicator = _create_landscape_indicator(conformant);
557 554
558 if (!sd->landscape_indicator) return EINA_TRUE; 555 if (!sd->landscape_indicator) return;
559 556
560 evas_object_show(sd->landscape_indicator); 557 evas_object_show(sd->landscape_indicator);
561 evas_object_data_set(sd->landscape_indicator, CONFORMANT_KEY, (void *) (intptr_t) rot); 558 evas_object_data_set(sd->landscape_indicator, CONFORMANT_KEY, (void *) (intptr_t) rot);
@@ -566,13 +563,12 @@ _on_rotation_changed(void *data, const Eo_Event *event EINA_UNUSED)
566 if (!sd->portrait_indicator) 563 if (!sd->portrait_indicator)
567 sd->portrait_indicator = _create_portrait_indicator(conformant); 564 sd->portrait_indicator = _create_portrait_indicator(conformant);
568 565
569 if (!sd->portrait_indicator) return EINA_TRUE; 566 if (!sd->portrait_indicator) return;
570 567
571 evas_object_show(sd->portrait_indicator); 568 evas_object_show(sd->portrait_indicator);
572 evas_object_data_set(sd->portrait_indicator, CONFORMANT_KEY, (void *) (intptr_t) rot); 569 evas_object_data_set(sd->portrait_indicator, CONFORMANT_KEY, (void *) (intptr_t) rot);
573 elm_layout_content_set(conformant, INDICATOR_PART, sd->portrait_indicator); 570 elm_layout_content_set(conformant, INDICATOR_PART, sd->portrait_indicator);
574 } 571 }
575 return EINA_TRUE;
576} 572}
577 573
578EOLIAN static Eina_Bool 574EOLIAN static Eina_Bool
diff --git a/src/lib/elementary/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c
index 496be05271..0102a23c7c 100644
--- a/src/lib/elementary/elm_dayselector.c
+++ b/src/lib/elementary/elm_dayselector.c
@@ -194,14 +194,12 @@ _item_signal_emit_cb(void *data,
194 eina_stringshare_replace(&it->day_style, emission); 194 eina_stringshare_replace(&it->day_style, emission);
195} 195}
196 196
197static Eina_Bool 197static void
198_item_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 198_item_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
199{ 199{
200 Elm_Dayselector_Item_Data *it = data; 200 Elm_Dayselector_Item_Data *it = data;
201 201
202 eo_event_callback_call(WIDGET(it), EFL_UI_CHECK_EVENT_CHANGED, (void *)it->day); 202 eo_event_callback_call(WIDGET(it), EFL_UI_CHECK_EVENT_CHANGED, (void *)it->day);
203
204 return EINA_TRUE;
205} 203}
206 204
207static Elm_Dayselector_Item_Data * 205static Elm_Dayselector_Item_Data *
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 3582780e52..c9100daa09 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -302,7 +302,7 @@ _validate(Evas_Object *obj)
302 vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text"); 302 vc.text = edje_object_part_text_get(sd->entry_edje, "elm.text");
303 res = eo_event_callback_call(obj, ELM_ENTRY_EVENT_VALIDATE, (void *)&vc); 303 res = eo_event_callback_call(obj, ELM_ENTRY_EVENT_VALIDATE, (void *)&vc);
304 buf = eina_strbuf_new(); 304 buf = eina_strbuf_new();
305 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EO_CALLBACK_STOP ? "fail" : "pass"); 305 eina_strbuf_append_printf(buf, "validation,%s,%s", vc.signal, res == EINA_FALSE ? "fail" : "pass");
306 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm"); 306 edje_object_signal_emit(sd->scr_edje, eina_strbuf_string_get(buf), "elm");
307 eina_tmpstr_del(vc.signal); 307 eina_tmpstr_del(vc.signal);
308 eina_strbuf_free(buf); 308 eina_strbuf_free(buf);
@@ -1371,7 +1371,7 @@ _hover_del_job(void *data)
1371 sd->hov_deljob = NULL; 1371 sd->hov_deljob = NULL;
1372} 1372}
1373 1373
1374static Eina_Bool 1374static void
1375_hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED) 1375_hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED)
1376{ 1376{
1377 ELM_ENTRY_DATA_GET(data, sd); 1377 ELM_ENTRY_DATA_GET(data, sd);
@@ -1390,8 +1390,6 @@ _hover_dismissed_cb(void *data, const Eo_Event *event EINA_UNUSED)
1390 elm_widget_scroll_freeze_pop(data); 1390 elm_widget_scroll_freeze_pop(data);
1391 ecore_job_del(sd->hov_deljob); 1391 ecore_job_del(sd->hov_deljob);
1392 sd->hov_deljob = ecore_job_add(_hover_del_job, data); 1392 sd->hov_deljob = ecore_job_add(_hover_del_job, data);
1393
1394 return EINA_TRUE;
1395} 1393}
1396 1394
1397static void 1395static void
@@ -2460,12 +2458,10 @@ _anchor_hover_del_cb(void *data,
2460 (sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj); 2458 (sd->anchor_hover.hover, EVAS_CALLBACK_DEL, _anchor_hover_del_cb, obj);
2461} 2459}
2462 2460
2463static Eina_Bool 2461static void
2464_anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 2462_anchor_hover_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
2465{ 2463{
2466 elm_entry_anchor_hover_end(data); 2464 elm_entry_anchor_hover_end(data);
2467
2468 return EINA_TRUE;
2469} 2465}
2470 2466
2471static void 2467static void
@@ -3929,7 +3925,7 @@ elm_entry_add(Evas_Object *parent)
3929 return obj; 3925 return obj;
3930} 3926}
3931 3927
3932static Eina_Bool 3928static void
3933_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) 3929_cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
3934{ 3930{
3935 const Eo_Callback_Array_Item *event = ev->info; 3931 const Eo_Callback_Array_Item *event = ev->info;
@@ -3937,10 +3933,9 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
3937 ELM_ENTRY_DATA_GET(ev->object, sd); 3933 ELM_ENTRY_DATA_GET(ev->object, sd);
3938 if (event->desc == ELM_ENTRY_EVENT_VALIDATE) 3934 if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
3939 sd->validators++; 3935 sd->validators++;
3940 return EO_CALLBACK_CONTINUE;
3941} 3936}
3942 3937
3943static Eina_Bool 3938static void
3944_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev) 3939_cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
3945{ 3940{
3946 const Eo_Callback_Array_Item *event = ev->info; 3941 const Eo_Callback_Array_Item *event = ev->info;
@@ -3948,7 +3943,7 @@ _cb_deleted(void *data EINA_UNUSED, const Eo_Event *ev)
3948 ELM_ENTRY_DATA_GET(ev->object, sd); 3943 ELM_ENTRY_DATA_GET(ev->object, sd);
3949 if (event->desc == ELM_ENTRY_EVENT_VALIDATE) 3944 if (event->desc == ELM_ENTRY_EVENT_VALIDATE)
3950 sd->validators--; 3945 sd->validators--;
3951 return EO_CALLBACK_CONTINUE; 3946 return;
3952 3947
3953} 3948}
3954 3949
diff --git a/src/lib/elementary/elm_frame.c b/src/lib/elementary/elm_frame.c
index 87c06341cf..4e5f02a038 100644
--- a/src/lib/elementary/elm_frame.c
+++ b/src/lib/elementary/elm_frame.c
@@ -97,12 +97,10 @@ _elm_frame_elm_widget_focus_direction(Eo *obj EINA_UNUSED, Elm_Frame_Data *_pd E
97 } 97 }
98} 98}
99 99
100static Eina_Bool 100static void
101_recalc(void *data, const Eo_Event *event EINA_UNUSED) 101_recalc(void *data, const Eo_Event *event EINA_UNUSED)
102{ 102{
103 elm_layout_sizing_eval(data); 103 elm_layout_sizing_eval(data);
104
105 return EINA_TRUE;
106} 104}
107 105
108static void 106static void
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 3d38929366..18ec3d9ef9 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -2011,7 +2011,7 @@ _item_realize(Elm_Gen_Item *it,
2011 edje_object_message_signal_process(VIEW(it)); 2011 edje_object_message_signal_process(VIEW(it));
2012} 2012}
2013 2013
2014static Eina_Bool 2014static void
2015_tree_effect_animator_cb(void *data, const Eo_Event *event EINA_UNUSED) 2015_tree_effect_animator_cb(void *data, const Eo_Event *event EINA_UNUSED)
2016{ 2016{
2017 int in = 0; 2017 int in = 0;
@@ -2167,8 +2167,6 @@ _tree_effect_animator_cb(void *data, const Eo_Event *event EINA_UNUSED)
2167 _item_tree_effect_finish(sd); 2167 _item_tree_effect_finish(sd);
2168 _elm_genlist_tree_effect_stop(sd); 2168 _elm_genlist_tree_effect_stop(sd);
2169 } 2169 }
2170
2171 return EO_CALLBACK_CONTINUE;
2172} 2170}
2173 2171
2174static void 2172static void
diff --git a/src/lib/elementary/elm_glview.c b/src/lib/elementary/elm_glview.c
index a010c15dc2..dfddc9df31 100644
--- a/src/lib/elementary/elm_glview.c
+++ b/src/lib/elementary/elm_glview.c
@@ -109,11 +109,11 @@ _elm_glview_efl_canvas_group_group_resize(Eo *obj, Elm_Glview_Data *sd, Evas_Coo
109 } 109 }
110} 110}
111 111
112static Eina_Bool 112static void
113_render_cb(void *obj, const Eo_Event *event EINA_UNUSED) 113_render_cb(void *obj, const Eo_Event *event EINA_UNUSED)
114{ 114{
115 ELM_GLVIEW_DATA_GET(obj, sd); 115 ELM_GLVIEW_DATA_GET(obj, sd);
116 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EINA_FALSE); 116 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, );
117 117
118 evas_object_render_op_set(wd->resize_obj, evas_object_render_op_get(obj)); 118 evas_object_render_op_set(wd->resize_obj, evas_object_render_op_get(obj));
119 119
@@ -151,7 +151,7 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED)
151 // Depending on the policy return true or false 151 // Depending on the policy return true or false
152 if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ON_DEMAND) 152 if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ON_DEMAND)
153 { 153 {
154 return EINA_TRUE; 154 return;
155 } 155 }
156 else if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ALWAYS) 156 else if (sd->render_policy == ELM_GLVIEW_RENDER_POLICY_ALWAYS)
157 { 157 {
@@ -164,7 +164,7 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED)
164 goto on_error; 164 goto on_error;
165 } 165 }
166 166
167 return EINA_TRUE; 167 return;
168 168
169 on_error: 169 on_error:
170 eo_event_callback_del(ecore_main_loop_get(), 170 eo_event_callback_del(ecore_main_loop_get(),
@@ -172,7 +172,6 @@ _render_cb(void *obj, const Eo_Event *event EINA_UNUSED)
172 _render_cb, 172 _render_cb,
173 obj); 173 obj);
174 sd->render_idle_enterer = 0; 174 sd->render_idle_enterer = 0;
175 return EO_CALLBACK_CONTINUE;
176} 175}
177 176
178static void 177static void
@@ -318,7 +317,7 @@ _elm_glview_efl_canvas_group_group_del(Eo *obj, Elm_Glview_Data *sd)
318 efl_canvas_group_del(eo_super(obj, MY_CLASS)); 317 efl_canvas_group_del(eo_super(obj, MY_CLASS));
319} 318}
320 319
321static Eina_Bool 320static void
322_cb_added(void *data EINA_UNUSED, const Eo_Event *ev) 321_cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
323{ 322{
324 const Eo_Callback_Array_Item *event = ev->info; 323 const Eo_Callback_Array_Item *event = ev->info;
@@ -333,8 +332,6 @@ _cb_added(void *data EINA_UNUSED, const Eo_Event *ev)
333 { 332 {
334 _set_render_policy_callback(ev->object); 333 _set_render_policy_callback(ev->object);
335 } 334 }
336
337 return EO_CALLBACK_CONTINUE;
338} 335}
339 336
340EAPI Evas_Object * 337EAPI Evas_Object *
diff --git a/src/lib/elementary/elm_helper.c b/src/lib/elementary/elm_helper.c
index ca8cd35285..966277daed 100644
--- a/src/lib/elementary/elm_helper.c
+++ b/src/lib/elementary/elm_helper.c
@@ -38,7 +38,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator)
38 return validator->status; 38 return validator->status;
39} 39}
40 40
41EAPI Eina_Bool 41EAPI void
42elm_validator_regexp_helper(void *data, const Eo_Event *event) 42elm_validator_regexp_helper(void *data, const Eo_Event *event)
43{ 43{
44 Elm_Validate_Content *vc = event->info; 44 Elm_Validate_Content *vc = event->info;
@@ -46,5 +46,6 @@ elm_validator_regexp_helper(void *data, const Eo_Event *event)
46 46
47 validator->status = regexec(&validator->regex, vc->text, (size_t)0, NULL, 0) ? ELM_REG_NOMATCH : ELM_REG_NOERROR; 47 validator->status = regexec(&validator->regex, vc->text, (size_t)0, NULL, 0) ? ELM_REG_NOMATCH : ELM_REG_NOERROR;
48 vc->signal = validator->signal; 48 vc->signal = validator->signal;
49 return validator->status ? EO_CALLBACK_STOP : EO_CALLBACK_CONTINUE; 49 if (validator->status)
50 eo_event_callback_stop(event->object);
50} 51}
diff --git a/src/lib/elementary/elm_helper.h b/src/lib/elementary/elm_helper.h
index 415faebd4b..71c264b61f 100644
--- a/src/lib/elementary/elm_helper.h
+++ b/src/lib/elementary/elm_helper.h
@@ -101,7 +101,7 @@ elm_validator_regexp_status_get(Elm_Validator_Regexp *validator) EINA_ARG_NONNUL
101 * @see elm_validotor_regex_regex_set() 101 * @see elm_validotor_regex_regex_set()
102 * @since 1.14 102 * @since 1.14
103 */ 103 */
104EAPI Eina_Bool 104EAPI void
105elm_validator_regexp_helper(void *data, const Eo_Event *event); 105elm_validator_regexp_helper(void *data, const Eo_Event *event);
106#endif 106#endif
107 107
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index 3e5133a2a2..ca8fe1ffc6 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -414,7 +414,7 @@ elm_atspi_relation_clone(const Elm_Atspi_Relation *relation)
414 return ret; 414 return ret;
415} 415}
416 416
417static Eina_Bool 417static void
418_on_rel_obj_del(void *data, const Eo_Event *event) 418_on_rel_obj_del(void *data, const Eo_Event *event)
419{ 419{
420 Elm_Atspi_Relation_Set *set = data; 420 Elm_Atspi_Relation_Set *set = data;
@@ -435,7 +435,6 @@ _on_rel_obj_del(void *data, const Eo_Event *event)
435 free(rel); 435 free(rel);
436 } 436 }
437 } 437 }
438 return EINA_TRUE;
439} 438}
440 439
441EAPI Eina_Bool 440EAPI Eina_Bool
diff --git a/src/lib/elementary/elm_interface_atspi_image.c b/src/lib/elementary/elm_interface_atspi_image.c
index 255ec4fb26..7224737fbd 100644
--- a/src/lib/elementary/elm_interface_atspi_image.c
+++ b/src/lib/elementary/elm_interface_atspi_image.c
@@ -8,12 +8,10 @@
8#include "elm_widget.h" 8#include "elm_widget.h"
9#include "elm_priv.h" 9#include "elm_priv.h"
10 10
11static Eina_Bool 11static void
12_free_desc_cb(void *data, const Eo_Event *event EINA_UNUSED) 12_free_desc_cb(void *data, const Eo_Event *event EINA_UNUSED)
13{ 13{
14 eina_stringshare_del(data); 14 eina_stringshare_del(data);
15
16 return EINA_TRUE;
17} 15}
18 16
19EOLIAN static const char* 17EOLIAN static const char*
diff --git a/src/lib/elementary/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c
index 7f13988186..5c1e166cce 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -59,13 +59,13 @@ _elm_scroll_wanted_coordinates_update(Elm_Scrollable_Smart_Interface_Data *sid,
59 Evas_Coord x, 59 Evas_Coord x,
60 Evas_Coord y); 60 Evas_Coord y);
61 61
62static Eina_Bool _elm_scroll_hold_animator(void *data, const Eo_Event *event); 62static void _elm_scroll_hold_animator(void *data, const Eo_Event *event);
63static Eina_Bool _elm_scroll_on_hold_animator(void *data, const Eo_Event *event); 63static void _elm_scroll_on_hold_animator(void *data, const Eo_Event *event);
64static Eina_Bool _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event); 64static void _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event);
65static Eina_Bool _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event); 65static void _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event);
66static Eina_Bool _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event); 66static void _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event);
67static Eina_Bool _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event); 67static void _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event);
68static Eina_Bool _elm_scroll_momentum_animator(void *data, const Eo_Event *event); 68static void _elm_scroll_momentum_animator(void *data, const Eo_Event *event);
69 69
70static double 70static double
71_round(double value, int pos) 71_round(double value, int pos)
@@ -1301,10 +1301,10 @@ _elm_scroll_momentum_end(Elm_Scrollable_Smart_Interface_Data *sid)
1301 } 1301 }
1302} 1302}
1303 1303
1304static Eina_Bool 1304static void
1305_elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED) 1305_elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
1306{ 1306{
1307 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(data, sid, EINA_FALSE); 1307 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(data, sid);
1308 Evas_Coord x, y, dx, w, odx, ed, md; 1308 Evas_Coord x, y, dx, w, odx, ed, md;
1309 double t, p, dt, pd, r; 1309 double t, p, dt, pd, r;
1310 1310
@@ -1353,13 +1353,12 @@ _elm_scroll_bounce_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
1353 ELM_ANIMATOR_CONNECT(sid->obj, sid->down.bounce_x_animator, _elm_scroll_bounce_x_animator, sid->obj); 1353 ELM_ANIMATOR_CONNECT(sid->obj, sid->down.bounce_x_animator, _elm_scroll_bounce_x_animator, sid->obj);
1354 } 1354 }
1355 } 1355 }
1356 return EO_CALLBACK_CONTINUE;
1357} 1356}
1358 1357
1359static Eina_Bool 1358static void
1360_elm_scroll_bounce_y_animator(void *data, const Eo_Event *event EINA_UNUSED) 1359_elm_scroll_bounce_y_animator(void *data, const Eo_Event *event EINA_UNUSED)
1361{ 1360{
1362 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN_VAL(data, sid, EINA_FALSE); 1361 ELM_SCROLL_IFACE_DATA_GET_OR_RETURN(data, sid);
1363 Evas_Coord x, y, dy, h, ody, ed, md; 1362 Evas_Coord x, y, dy, h, ody, ed, md;
1364 double t, p, dt, pd, r; 1363 double t, p, dt, pd, r;
1365 1364
@@ -1408,8 +1407,6 @@ _elm_scroll_bounce_y_animator(void *data, const Eo_Event *event EINA_UNUSED)
1408 ELM_ANIMATOR_DISCONNECT(sid->obj, sid->down.bounce_y_animator, _elm_scroll_bounce_y_animator, sid->obj); 1407 ELM_ANIMATOR_DISCONNECT(sid->obj, sid->down.bounce_y_animator, _elm_scroll_bounce_y_animator, sid->obj);
1409 } 1408 }
1410 } 1409 }
1411
1412 return EO_CALLBACK_CONTINUE;
1413} 1410}
1414 1411
1415static void 1412static void
@@ -2085,7 +2082,7 @@ _paging_is_enabled(Elm_Scrollable_Smart_Interface_Data *sid)
2085 return EINA_TRUE; 2082 return EINA_TRUE;
2086} 2083}
2087 2084
2088static Eina_Bool 2085static void
2089_elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED) 2086_elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED)
2090{ 2087{
2091 double t, at, dt, p, r; 2088 double t, at, dt, p, r;
@@ -2096,7 +2093,7 @@ _elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED)
2096 if (!sid->pan_obj) 2093 if (!sid->pan_obj)
2097 { 2094 {
2098 ELM_ANIMATOR_DISCONNECT(sid->obj, sid->down.momentum_animator, _elm_scroll_momentum_animator, sid); 2095 ELM_ANIMATOR_DISCONNECT(sid->obj, sid->down.momentum_animator, _elm_scroll_momentum_animator, sid);
2099 return EO_CALLBACK_CONTINUE; 2096 return;
2100 } 2097 }
2101 2098
2102 t = ecore_loop_time_get(); 2099 t = ecore_loop_time_get();
@@ -2166,8 +2163,6 @@ _elm_scroll_momentum_animator(void *data, const Eo_Event *event EINA_UNUSED)
2166 _elm_scroll_wanted_region_set(sid->obj); 2163 _elm_scroll_wanted_region_set(sid->obj);
2167 } 2164 }
2168 } 2165 }
2169
2170 return EO_CALLBACK_CONTINUE;
2171} 2166}
2172 2167
2173static Evas_Coord 2168static Evas_Coord
@@ -2264,7 +2259,7 @@ _elm_scroll_page_y_get(Elm_Scrollable_Smart_Interface_Data *sid,
2264 return y; 2259 return y;
2265} 2260}
2266 2261
2267static Eina_Bool 2262static void
2268_elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED) 2263_elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
2269{ 2264{
2270 Elm_Scrollable_Smart_Interface_Data *sid = data; 2265 Elm_Scrollable_Smart_Interface_Data *sid = data;
@@ -2295,14 +2290,13 @@ _elm_scroll_scroll_to_x_animator(void *data, const Eo_Event *event EINA_UNUSED)
2295 } 2290 }
2296 elm_interface_scrollable_content_pos_set(sid->obj, px, py, EINA_TRUE); 2291 elm_interface_scrollable_content_pos_set(sid->obj, px, py, EINA_TRUE);
2297 _elm_scroll_wanted_coordinates_update(sid, px, py); 2292 _elm_scroll_wanted_coordinates_update(sid, px, py);
2298 return EO_CALLBACK_CONTINUE; 2293 return;
2299 2294
2300 on_end: 2295 on_end:
2301 ELM_ANIMATOR_DISCONNECT(sid->obj, sid->scrollto.x.animator, _elm_scroll_scroll_to_x_animator, sid); 2296 ELM_ANIMATOR_DISCONNECT(sid->obj, sid->scrollto.x.animator, _elm_scroll_scroll_to_x_animator, sid);
2302 return EO_CALLBACK_CONTINUE;
2303} 2297}
2304 2298
2305static Eina_Bool 2299static void
2306_elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event EINA_UNUSED) 2300_elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event EINA_UNUSED)
2307{ 2301{
2308 Elm_Scrollable_Smart_Interface_Data *sid = data; 2302 Elm_Scrollable_Smart_Interface_Data *sid = data;
@@ -2334,11 +2328,10 @@ _elm_scroll_scroll_to_y_animator(void *data, const Eo_Event *event EINA_UNUSED)
2334 elm_interface_scrollable_content_pos_set(sid->obj, px, py, EINA_TRUE); 2328 elm_interface_scrollable_content_pos_set(sid->obj, px, py, EINA_TRUE);
2335 _elm_scroll_wanted_coordinates_update(sid, px, py); 2329 _elm_scroll_wanted_coordinates_update(sid, px, py);
2336 2330
2337 return EO_CALLBACK_CONTINUE; 2331 return;
2338 2332
2339 on_end: 2333 on_end:
2340 ELM_ANIMATOR_DISCONNECT(sid->obj, sid->scrollto.y.animator, _elm_scroll_scroll_to_y_animator, sid); 2334 ELM_ANIMATOR_DISCONNECT(sid->obj, sid->scrollto.y.animator, _elm_scroll_scroll_to_y_animator, sid);
2341 return EO_CALLBACK_CONTINUE;
2342} 2335}
2343 2336
2344static void 2337static void
@@ -3097,7 +3090,7 @@ _elm_scroll_hold_enterer(void *data)
3097 return EINA_FALSE; 3090 return EINA_FALSE;
3098} 3091}
3099 3092
3100static Eina_Bool 3093static void
3101_elm_scroll_hold_animator(void *data, const Eo_Event *event EINA_UNUSED) 3094_elm_scroll_hold_animator(void *data, const Eo_Event *event EINA_UNUSED)
3102{ 3095{
3103 Elm_Scrollable_Smart_Interface_Data *sid = data; 3096 Elm_Scrollable_Smart_Interface_Data *sid = data;
@@ -3105,10 +3098,9 @@ _elm_scroll_hold_animator(void *data, const Eo_Event *event EINA_UNUSED)
3105 ecore_idle_enterer_del(sid->down.hold_enterer); 3098 ecore_idle_enterer_del(sid->down.hold_enterer);
3106 sid->down.hold_enterer = 3099 sid->down.hold_enterer =
3107 ecore_idle_enterer_before_add(_elm_scroll_hold_enterer, sid); 3100 ecore_idle_enterer_before_add(_elm_scroll_hold_enterer, sid);
3108 return EO_CALLBACK_CONTINUE;
3109} 3101}
3110 3102
3111static Eina_Bool 3103static void
3112_elm_scroll_on_hold_animator(void *data, const Eo_Event *event EINA_UNUSED) 3104_elm_scroll_on_hold_animator(void *data, const Eo_Event *event EINA_UNUSED)
3113{ 3105{
3114 double t, td; 3106 double t, td;
@@ -3154,8 +3146,6 @@ _elm_scroll_on_hold_animator(void *data, const Eo_Event *event EINA_UNUSED)
3154 elm_interface_scrollable_content_pos_set(sid->obj, x, y, EINA_TRUE); 3146 elm_interface_scrollable_content_pos_set(sid->obj, x, y, EINA_TRUE);
3155 } 3147 }
3156 sid->down.onhold_tlast = t; 3148 sid->down.onhold_tlast = t;
3157
3158 return EO_CALLBACK_CONTINUE;
3159} 3149}
3160 3150
3161static void 3151static void
@@ -3815,13 +3805,13 @@ _elm_scroll_pan_resized_cb(void *data,
3815} 3805}
3816 3806
3817/* even external pan objects get this */ 3807/* even external pan objects get this */
3818static Eina_Bool 3808static void
3819_elm_scroll_pan_changed_cb(void *data, const Eo_Event *event EINA_UNUSED) 3809_elm_scroll_pan_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
3820{ 3810{
3821 Evas_Coord w = 0, h = 0; 3811 Evas_Coord w = 0, h = 0;
3822 Elm_Scrollable_Smart_Interface_Data *sid = data; 3812 Elm_Scrollable_Smart_Interface_Data *sid = data;
3823 3813
3824 if (!sid->pan_obj) return EINA_TRUE; 3814 if (!sid->pan_obj) return;
3825 3815
3826 elm_obj_pan_content_size_get(sid->pan_obj, &w, &h); 3816 elm_obj_pan_content_size_get(sid->pan_obj, &w, &h);
3827 if ((w != sid->content_info.w) || (h != sid->content_info.h)) 3817 if ((w != sid->content_info.w) || (h != sid->content_info.h))
@@ -3835,8 +3825,6 @@ _elm_scroll_pan_changed_cb(void *data, const Eo_Event *event EINA_UNUSED)
3835 sid->content_info.resized = EINA_TRUE; 3825 sid->content_info.resized = EINA_TRUE;
3836 _elm_scroll_wanted_region_set(sid->obj); 3826 _elm_scroll_wanted_region_set(sid->obj);
3837 } 3827 }
3838
3839 return EINA_TRUE;
3840} 3828}
3841 3829
3842static void 3830static void
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index 6e75709c4b..3888d6c058 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -1145,7 +1145,7 @@ _zoom_do(Elm_Map_Data *sd,
1145 evas_object_smart_changed(sd->pan_obj); 1145 evas_object_smart_changed(sd->pan_obj);
1146} 1146}
1147 1147
1148static Eina_Bool 1148static void
1149_zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) 1149_zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
1150{ 1150{
1151 ELM_MAP_DATA_GET(data, sd); 1151 ELM_MAP_DATA_GET(data, sd);
@@ -1162,10 +1162,9 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
1162 sd->ani.zoom_cnt--; 1162 sd->ani.zoom_cnt--;
1163 _zoom_do(sd, sd->ani.zoom); 1163 _zoom_do(sd, sd->ani.zoom);
1164 } 1164 }
1165 return EO_CALLBACK_CONTINUE;
1166} 1165}
1167 1166
1168static Eina_Bool 1167static void
1169_zoom_bring_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) 1168_zoom_bring_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
1170{ 1169{
1171 ELM_MAP_DATA_GET(data, sd); 1170 ELM_MAP_DATA_GET(data, sd);
@@ -1199,8 +1198,6 @@ _zoom_bring_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
1199 sd->ani.region_cnt--; 1198 sd->ani.region_cnt--;
1200 } 1199 }
1201 } 1200 }
1202
1203 return EO_CALLBACK_CONTINUE;
1204} 1201}
1205 1202
1206static Eina_Bool 1203static Eina_Bool
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 662a54d85e..358d1634db 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -423,15 +423,13 @@ _menu_hide(void *data,
423 } 423 }
424} 424}
425 425
426static Eina_Bool 426static void
427_hover_dismissed_cb(void *data, const Eo_Event *event) 427_hover_dismissed_cb(void *data, const Eo_Event *event)
428{ 428{
429 _menu_hide(data, event->object, event->info); 429 _menu_hide(data, event->object, event->info);
430 eo_event_callback_call 430 eo_event_callback_call
431 (data, EFL_UI_EVENT_CLICKED, NULL); 431 (data, EFL_UI_EVENT_CLICKED, NULL);
432 eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL); 432 eo_event_callback_call(data, ELM_MENU_EVENT_DISMISSED, NULL);
433
434 return EINA_TRUE;
435} 433}
436 434
437static void 435static void
@@ -520,7 +518,7 @@ _menu_item_inactivate_cb(void *data,
520 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE); 518 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
521} 519}
522 520
523static Eina_Bool 521static void
524_block_menu(void *_sd, const Eo_Event *event EINA_UNUSED) 522_block_menu(void *_sd, const Eo_Event *event EINA_UNUSED)
525{ 523{
526 const Eina_List *l; 524 const Eina_List *l;
@@ -534,11 +532,9 @@ _block_menu(void *_sd, const Eo_Event *event EINA_UNUSED)
534 current->blocked = EINA_TRUE; 532 current->blocked = EINA_TRUE;
535 elm_object_item_disabled_set(eo_current, EINA_TRUE); 533 elm_object_item_disabled_set(eo_current, EINA_TRUE);
536 } 534 }
537
538 return EINA_TRUE;
539} 535}
540 536
541static Eina_Bool 537static void
542_unblock_menu(void *_sd, const Eo_Event *event EINA_UNUSED) 538_unblock_menu(void *_sd, const Eo_Event *event EINA_UNUSED)
543{ 539{
544 const Eina_List *l; 540 const Eina_List *l;
@@ -551,8 +547,6 @@ _unblock_menu(void *_sd, const Eo_Event *event EINA_UNUSED)
551 elm_object_item_disabled_set(eo_current, !current->was_enabled); 547 elm_object_item_disabled_set(eo_current, !current->was_enabled);
552 current->blocked = EINA_FALSE; 548 current->blocked = EINA_FALSE;
553 } 549 }
554
555 return EINA_TRUE;
556} 550}
557 551
558EOLIAN static void 552EOLIAN static void
diff --git a/src/lib/elementary/elm_panel.c b/src/lib/elementary/elm_panel.c
index 85572f8853..5a057e3e67 100644
--- a/src/lib/elementary/elm_panel.c
+++ b/src/lib/elementary/elm_panel.c
@@ -1085,7 +1085,7 @@ _elm_panel_efl_canvas_group_group_move(Eo *obj, Elm_Panel_Data *sd, Evas_Coord x
1085 1085
1086// FIXME: This is definitively not an animator, but a pre calc function 1086// FIXME: This is definitively not an animator, but a pre calc function
1087// Not sure if I can hook on smart calc or on RENDER_PRE, will be left for later 1087// Not sure if I can hook on smart calc or on RENDER_PRE, will be left for later
1088static Eina_Bool 1088static void
1089_elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) 1089_elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
1090{ 1090{
1091 Evas_Object *obj = data; 1091 Evas_Object *obj = data;
@@ -1097,7 +1097,7 @@ _elm_panel_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
1097 if (sd->hidden) _drawer_close(obj, w, h, EINA_FALSE); 1097 if (sd->hidden) _drawer_close(obj, w, h, EINA_FALSE);
1098 else _drawer_open(obj, w, h, EINA_FALSE); 1098 else _drawer_open(obj, w, h, EINA_FALSE);
1099 1099
1100 return EO_CALLBACK_STOP; 1100 eo_event_callback_stop(event->object);
1101} 1101}
1102 1102
1103EOLIAN static void 1103EOLIAN static void
diff --git a/src/lib/elementary/elm_photo.c b/src/lib/elementary/elm_photo.c
index 317f405d85..0436a3dc37 100644
--- a/src/lib/elementary/elm_photo.c
+++ b/src/lib/elementary/elm_photo.c
@@ -234,12 +234,10 @@ _elm_photo_internal_image_follow(Evas_Object *obj)
234 (img, EVAS_CALLBACK_RESIZE, _icon_move_resize_cb, obj); 234 (img, EVAS_CALLBACK_RESIZE, _icon_move_resize_cb, obj);
235} 235}
236 236
237static Eina_Bool 237static void
238_on_thumb_done(void *data, const Eo_Event *event EINA_UNUSED) 238_on_thumb_done(void *data, const Eo_Event *event EINA_UNUSED)
239{ 239{
240 _elm_photo_internal_image_follow(data); 240 _elm_photo_internal_image_follow(data);
241
242 return EINA_TRUE;
243} 241}
244 242
245EOLIAN static void 243EOLIAN static void
diff --git a/src/lib/elementary/elm_photocam.c b/src/lib/elementary/elm_photocam.c
index 9cfec5d38f..139c5111ef 100644
--- a/src/lib/elementary/elm_photocam.c
+++ b/src/lib/elementary/elm_photocam.c
@@ -765,7 +765,7 @@ _zoom_do(Evas_Object *obj,
765 return EINA_TRUE; 765 return EINA_TRUE;
766} 766}
767 767
768static Eina_Bool 768static void
769_zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED) 769_zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
770{ 770{
771 double t; 771 double t;
@@ -789,8 +789,6 @@ _zoom_anim_cb(void *data, const Eo_Event *event EINA_UNUSED)
789 eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj); 789 eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _zoom_anim_cb, obj);
790 eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL); 790 eo_event_callback_call(obj, EFL_UI_EVENT_ZOOM_STOP, NULL);
791 } 791 }
792
793 return EO_CALLBACK_CONTINUE;
794} 792}
795 793
796static Eina_Bool 794static Eina_Bool
@@ -1034,7 +1032,7 @@ _elm_photocam_elm_widget_event(Eo *obj, Elm_Photocam_Data *_pd EINA_UNUSED, Evas
1034 return EINA_TRUE; 1032 return EINA_TRUE;
1035} 1033}
1036 1034
1037static Eina_Bool 1035static void
1038_bounce_eval(void *data, const Eo_Event *event EINA_UNUSED) 1036_bounce_eval(void *data, const Eo_Event *event EINA_UNUSED)
1039{ 1037{
1040 Evas_Object *obj = data; 1038 Evas_Object *obj = data;
@@ -1070,7 +1068,7 @@ _bounce_eval(void *data, const Eo_Event *event EINA_UNUSED)
1070 1068
1071 _zoom_do(obj, 1.0 - (1.0 - tt)); 1069 _zoom_do(obj, 1.0 - (1.0 - tt));
1072 1070
1073 return EO_CALLBACK_CONTINUE; 1071 return;
1074 1072
1075 on_end: 1073 on_end:
1076 sd->g_layer_zoom.imx = 0; 1074 sd->g_layer_zoom.imx = 0;
@@ -1080,7 +1078,6 @@ _bounce_eval(void *data, const Eo_Event *event EINA_UNUSED)
1080 elm_interface_scrollable_freeze_set(obj, EINA_FALSE); 1078 elm_interface_scrollable_freeze_set(obj, EINA_FALSE);
1081 1079
1082 eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj); 1080 eo_event_callback_del(obj, EFL_EVENT_ANIMATOR_TICK, _bounce_eval, obj);
1083 return EO_CALLBACK_CONTINUE;
1084} 1081}
1085 1082
1086static void 1083static void
@@ -1954,7 +1951,9 @@ done:
1954 // FIXME: If one day we do support partial animator in photocam, this would require change 1951 // FIXME: If one day we do support partial animator in photocam, this would require change
1955 Eo_Event event = {}; 1952 Eo_Event event = {};
1956 event.object = evas_object_evas_get(obj); 1953 event.object = evas_object_evas_get(obj);
1957 if (!_zoom_anim_cb(obj, &event)) 1954 _zoom_anim_cb(obj, &event);
1955 // FIXME: Unhandled.
1956 if (0)
1958 { 1957 {
1959 _elm_photocam_bounce_reset(obj, sd); 1958 _elm_photocam_bounce_reset(obj, sd);
1960 an = 0; 1959 an = 0;
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 80bb591d34..bb5c44990f 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -41,13 +41,13 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
41static Eina_Bool _key_action_spin(Evas_Object *obj, const char *params); 41static Eina_Bool _key_action_spin(Evas_Object *obj, const char *params);
42static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params); 42static Eina_Bool _key_action_toggle(Evas_Object *obj, const char *params);
43 43
44static Eina_Bool 44static void
45_inc_dec_button_clicked_cb(void *data, const Eo_Event *event); 45_inc_dec_button_clicked_cb(void *data, const Eo_Event *event);
46static Eina_Bool 46static void
47_inc_dec_button_pressed_cb(void *data, const Eo_Event *event); 47_inc_dec_button_pressed_cb(void *data, const Eo_Event *event);
48static Eina_Bool 48static void
49_inc_dec_button_unpressed_cb(void *data, const Eo_Event *event); 49_inc_dec_button_unpressed_cb(void *data, const Eo_Event *event);
50static Eina_Bool 50static void
51_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event); 51_inc_dec_button_mouse_move_cb(void *data, const Eo_Event *event);
52 52
53static const Elm_Action key_actions[] = { 53static const Elm_Action key_actions[] = {
@@ -412,12 +412,10 @@ _entry_value_apply(Evas_Object *obj)
412 _delay_change_timer_cb, obj); 412 _delay_change_timer_cb, obj);
413} 413}
414 414
415static Eina_Bool 415static void
416_entry_activated_cb(void *data, const Eo_Event *event EINA_UNUSED) 416_entry_activated_cb(void *data, const Eo_Event *event EINA_UNUSED)
417{ 417{
418 _entry_value_apply(data); 418 _entry_value_apply(data);
419
420 return EINA_TRUE;
421} 419}
422 420
423static int 421static int
@@ -832,7 +830,7 @@ _button_inc_dec_stop_cb(void *data,
832 _spin_stop(data); 830 _spin_stop(data);
833} 831}
834 832
835static Eina_Bool 833static void
836_inc_dec_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED) 834_inc_dec_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
837{ 835{
838 ELM_SPINNER_DATA_GET(data, sd); 836 ELM_SPINNER_DATA_GET(data, sd);
@@ -844,11 +842,9 @@ _inc_dec_button_clicked_cb(void *data, const Eo_Event *event EINA_UNUSED)
844 if (sd->entry_visible) _entry_value_apply(data); 842 if (sd->entry_visible) _entry_value_apply(data);
845 if (_elm_config->access_mode) 843 if (_elm_config->access_mode)
846 _access_increment_decrement_info_say(data, EINA_TRUE); 844 _access_increment_decrement_info_say(data, EINA_TRUE);
847
848 return EINA_TRUE;
849} 845}
850 846
851static Eina_Bool 847static void
852_inc_dec_button_pressed_cb(void *data, const Eo_Event *event) 848_inc_dec_button_pressed_cb(void *data, const Eo_Event *event)
853{ 849{
854 ELM_SPINNER_DATA_GET(data, sd); 850 ELM_SPINNER_DATA_GET(data, sd);
@@ -862,11 +858,9 @@ _inc_dec_button_pressed_cb(void *data, const Eo_Event *event)
862 _val_inc_dec_start, data); 858 _val_inc_dec_start, data);
863 859
864 if (sd->entry_visible) _entry_value_apply(data); 860 if (sd->entry_visible) _entry_value_apply(data);
865
866 return EINA_TRUE;
867} 861}
868 862
869static Eina_Bool 863static void
870_inc_dec_button_unpressed_cb(void *data, const Eo_Event *event EINA_UNUSED) 864_inc_dec_button_unpressed_cb(void *data, const Eo_Event *event EINA_UNUSED)
871{ 865{
872 ELM_SPINNER_DATA_GET(data, sd); 866 ELM_SPINNER_DATA_GET(data, sd);
@@ -878,19 +872,15 @@ _inc_dec_button_unpressed_cb(void *data, const Eo_Event *event EINA_UNUSED)
878 } 872 }
879 873
880 _spin_stop(data);