stefan pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4f840c5febe94c16627f034926cb8fdf933b465e
commit 4f840c5febe94c16627f034926cb8fdf933b465e Author: Stefan Schmidt <[email protected]> Date: Tue Aug 9 16:17:14 2016 +0200 elm: config: fix API naming to use disabled instead of disable to unify We use disabled across our APIs so better fix this new one to unify it before we release. This was introduced in commit 0116e072888feeade7a15ad8e206d1e35dc3511b Many thanks to DaveMDS for reporting this! --- src/bin/elementary/config.c | 6 +++--- src/lib/elementary/elm_config.c | 8 ++++---- src/lib/elementary/elm_config.h | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/bin/elementary/config.c b/src/bin/elementary/config.c index c321a5c..208057f 100644 --- a/src/bin/elementary/config.c +++ b/src/bin/elementary/config.c @@ -158,10 +158,10 @@ static void scroll_animation_disable_change(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUSED) { Eina_Bool val = elm_check_state_get(obj); - Eina_Bool sb = elm_config_scroll_animation_disable_get(); + Eina_Bool sb = elm_config_scroll_animation_disabled_get(); if (val == sb) return; - elm_config_scroll_animation_disable_set(val); + elm_config_scroll_animation_disabled_set(val); elm_config_all_flush(); } @@ -3776,7 +3776,7 @@ _status_config_scrolling(Evas_Object *win, "immediately instead of animating", scroll_animation_disable_change, NULL); evas_object_data_set(win, "scroll_animation_disable", ck); - elm_check_state_set(ck, elm_config_scroll_animation_disable_get()); + elm_check_state_set(ck, elm_config_scroll_animation_disabled_get()); /* Bounce */ _status_config_scrolling_bounce(win, box); diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c index 1c4817a..a4d687a 100644 --- a/src/lib/elementary/elm_config.c +++ b/src/lib/elementary/elm_config.c @@ -3401,13 +3401,13 @@ elm_config_scroll_thumbscroll_smooth_start_set(Eina_Bool enable) } EAPI Eina_Bool -elm_config_scroll_animation_disable_get(void) +elm_config_scroll_animation_disabled_get(void) { return _elm_config->scroll_animation_disable; } EAPI void -elm_config_scroll_animation_disable_set(Eina_Bool disable) +elm_config_scroll_animation_disabled_set(Eina_Bool disable) { _elm_config->scroll_animation_disable = !!disable; } @@ -4518,7 +4518,7 @@ _efl_config_global_efl_config_config_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNU CONFIG_SETD(scroll_thumbscroll_border_friction); CONFIG_SETD(scroll_thumbscroll_sensitivity_friction); CONFIG_SETB(scroll_thumbscroll_smooth_start); - CONFIG_SETB(scroll_animation_disable); + CONFIG_SETB(scroll_animation_disabled); CONFIG_SETD(scroll_accel_factor); CONFIG_SETD(scroll_thumbscroll_smooth_amount); CONFIG_SETD(scroll_thumbscroll_smooth_time_window); @@ -4650,7 +4650,7 @@ _efl_config_global_efl_config_config_get(const Eo *obj EINA_UNUSED, void *_pd EI CONFIG_GETD(scroll_thumbscroll_border_friction); CONFIG_GETD(scroll_thumbscroll_sensitivity_friction); CONFIG_GETB(scroll_thumbscroll_smooth_start); - CONFIG_GETB(scroll_animation_disable); + CONFIG_GETB(scroll_animation_disabled); CONFIG_GETD(scroll_accel_factor); CONFIG_GETD(scroll_thumbscroll_smooth_amount); CONFIG_GETD(scroll_thumbscroll_smooth_time_window); diff --git a/src/lib/elementary/elm_config.h b/src/lib/elementary/elm_config.h index fe2904c..9c0a2ad 100644 --- a/src/lib/elementary/elm_config.h +++ b/src/lib/elementary/elm_config.h @@ -624,12 +624,12 @@ EAPI void elm_config_scroll_thumbscroll_smooth_start_set(Eina_Bool enabl * * @return State of this option * - * @see elm_config_scroll_animation_disable_set() + * @see elm_config_scroll_animation_disabled_set() * * @since 1.18 * @ingroup Elm_Scrolling */ -EAPI Eina_Bool elm_config_scroll_animation_disable_get(void); +EAPI Eina_Bool elm_config_scroll_animation_disabled_get(void); /** * Set the value for this option @@ -639,12 +639,12 @@ EAPI Eina_Bool elm_config_scroll_animation_disable_get(void); * * @param disable The state of this option * - * @see elm_config_scroll_animation_disable_get() + * @see elm_config_scroll_animation_disabled_get() * * @since 1.18 * @ingroup Elm_Scrolling */ -EAPI void elm_config_scroll_animation_disable_set(Eina_Bool enable); +EAPI void elm_config_scroll_animation_disabled_set(Eina_Bool enable); /** * Get the value of this option --
