diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2019-03-04 13:36:41 -0500 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@samsung.com> | 2019-03-04 13:36:41 -0500 |
| commit | 644b771fe43ad76a70de8f6e1a07ca9159c3458c (patch) | |
| tree | 0640b7519233d4691ae0b43ee29470da97e1c327 /src/lib/elementary/efl_ui_check.c | |
| parent | 2f007f7a08b680988c6a4728f2809facebec6f79 (diff) | |
| download | efl-644b771fe43ad76a70de8f6e1a07ca9159c3458c.tar.gz | |
efl.ui: Efl.Ui.Theme_Apply_Result -> Efl.Ui.Theme_Apply_Error
Summary:
this swaps the values of "no error" and "error" in order to maintain
consistency with the rest of efl where the zero value means "no error"
Depends on D8060
Reviewers: cedric
Reviewed By: cedric
Subscribers: segfaultxavi, cedric, #reviewers, #committers
Tags: #efl_api
Differential Revision: https://phab.enlightenment.org/D8063
Diffstat (limited to 'src/lib/elementary/efl_ui_check.c')
| -rw-r--r-- | src/lib/elementary/efl_ui_check.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c index 6b5dd01645..b079796fd7 100644 --- a/src/lib/elementary/efl_ui_check.c +++ b/src/lib/elementary/efl_ui_check.c @@ -135,16 +135,15 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED) return EINA_TRUE; } -EOLIAN static Efl_Ui_Theme_Apply_Result +EOLIAN static Efl_Ui_Theme_Apply_Error _efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; + Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; - ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_RESULT_FAIL); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, EFL_UI_THEME_APPLY_ERROR_GENERIC); int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); - - if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; + if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; if (elm_widget_is_legacy(obj)) { @@ -492,13 +491,13 @@ _icon_signal_emit(Evas_Object *obj) /* FIXME: replicated from elm_layout just because check's icon spot * is elm.swallow.content, not elm.swallow.icon. Fix that whenever we * can changed the theme API */ -EOLIAN static Efl_Ui_Theme_Apply_Result +EOLIAN static Efl_Ui_Theme_Apply_Error _efl_ui_check_legacy_efl_ui_widget_theme_apply(Eo *obj, void *_pd EINA_UNUSED) { - Efl_Ui_Theme_Apply_Result int_ret = EFL_UI_THEME_APPLY_RESULT_FAIL; + Efl_Ui_Theme_Apply_Error int_ret = EFL_UI_THEME_APPLY_ERROR_GENERIC; int_ret = efl_ui_widget_theme_apply(efl_super(obj, EFL_UI_CHECK_LEGACY_CLASS)); - if (!int_ret) return EFL_UI_THEME_APPLY_RESULT_FAIL; + if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; _icon_signal_emit(obj); |