jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=c3dc34f38167718d95f05375f5484843e04980bd
commit c3dc34f38167718d95f05375f5484843e04980bd Author: Avi Levin <avi.le...@samsung.com> Date: Thu May 14 13:31:40 2015 +0300 elm_prefs, elm_check: porting evas smart callbacks to eo --- src/lib/elm_check.c | 6 +++--- src/lib/elm_prefs.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lib/elm_check.c b/src/lib/elm_check.c index be376a6..0dbf571 100644 --- a/src/lib/elm_check.c +++ b/src/lib/elm_check.c @@ -68,7 +68,7 @@ _activate(Evas_Object *obj) _elm_access_say(E_("State: Off")); } - evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); + eo_do(obj, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL)); if (_elm_config->atspi_mode) elm_interface_atspi_accessible_state_changed_signal_emit(obj, @@ -273,7 +273,7 @@ _on_check_off(void *data, if (sd->statep) *sd->statep = sd->state; elm_layout_signal_emit(obj, "elm,state,check,off", "elm"); - evas_object_smart_callback_call(data, SIG_CHANGED, NULL); + eo_do(obj, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL)); if (_elm_config->atspi_mode) elm_interface_atspi_accessible_state_changed_signal_emit(data, @@ -294,7 +294,7 @@ _on_check_on(void *data, sd->state = EINA_TRUE; if (sd->statep) *sd->statep = sd->state; elm_layout_signal_emit(obj, "elm,state,check,on", "elm"); - evas_object_smart_callback_call(data, SIG_CHANGED, NULL); + eo_do(obj, eo_event_callback_call(ELM_CHECK_EVENT_CHANGED, NULL)); if (_elm_config->atspi_mode) elm_interface_atspi_accessible_state_changed_signal_emit(data, diff --git a/src/lib/elm_prefs.c b/src/lib/elm_prefs.c index 585e329..2bb8880 100644 --- a/src/lib/elm_prefs.c +++ b/src/lib/elm_prefs.c @@ -136,8 +136,8 @@ _elm_prefs_save(void *data) { elm_prefs_data_save(sd->prefs_data, NULL, NULL); - evas_object_smart_callback_call - (wd->obj, SIG_PAGE_SAVED, (char *)sd->root->name); + eo_do(wd->obj, eo_event_callback_call + (ELM_PREFS_EVENT_PAGE_SAVED, (char *)sd->root->name)); } sd->dirty = EINA_FALSE; @@ -300,8 +300,8 @@ _elm_prefs_item_changed_report(Eo *obj, snprintf(buf, sizeof(buf), "%s:%s", it->page->name, it->name); - evas_object_smart_callback_call - (wd->obj, SIG_ITEM_CHANGED, buf); + eo_do(wd->obj, eo_event_callback_call + (ELM_PREFS_EVENT_ITEM_CHANGED, buf)); } static Elm_Prefs_Item_Node * @@ -400,8 +400,8 @@ _prefs_data_autosaved_cb(void *cb_data, ELM_PREFS_DATA_GET(cb_data, sd); ELM_WIDGET_DATA_GET_OR_RETURN(cb_data, wd); - evas_object_smart_callback_call - (wd->obj, SIG_PAGE_SAVED, event_info); + eo_do(wd->obj, eo_event_callback_call + (ELM_PREFS_EVENT_PAGE_SAVED, event_info)); sd->dirty = EINA_FALSE; } @@ -556,8 +556,8 @@ _item_changed_cb(Evas_Object *it_obj) /* we use the changed cb on ACTION/RESET/SAVE items specially */ if (it->type == ELM_PREFS_TYPE_ACTION) { - evas_object_smart_callback_call - (wd->obj, SIG_ACTION, buf); + eo_do(wd->obj, eo_event_callback_call + (ELM_PREFS_EVENT_ACTION, buf)); return; } @@ -1175,8 +1175,8 @@ _elm_prefs_efl_file_file_set(Eo *obj, Elm_Prefs_Data *sd, const char *file, cons _elm_prefs_values_get_default(sd->root, EINA_FALSE); - evas_object_smart_callback_call - (obj, SIG_PAGE_LOADED, (char *)sd->root->name); + eo_do(obj, eo_event_callback_call + (ELM_PREFS_EVENT_PAGE_LOADED, (char *)sd->root->name)); return EINA_TRUE; } @@ -1220,8 +1220,8 @@ _elm_prefs_data_set(Eo *obj, Elm_Prefs_Data *sd, Elm_Prefs_Data *prefs_data) sd->values_fetching = EINA_FALSE; end: - evas_object_smart_callback_call - (obj, SIG_PAGE_CHANGED, (char *)sd->root->name); + eo_do(obj, eo_event_callback_call + (ELM_PREFS_EVENT_PAGE_CHANGED, (char *)sd->root->name)); return EINA_TRUE; } --