yakov pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=9166f54d8b9653dc34c8669fcbb4d856778845a2
commit 9166f54d8b9653dc34c8669fcbb4d856778845a2 Author: Yakov Goldberg <[email protected]> Date: Mon Dec 30 14:26:04 2013 +0200 win: fix parameter order in elm_win_available_profiles_get() for consistency --- src/lib/elm_win.c | 6 +++--- src/lib/elm_win_eo.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index cee4353..d3f0673 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -4054,16 +4054,16 @@ elm_win_available_profiles_get(Evas_Object *obj, { ELM_WIN_CHECK(obj) EINA_FALSE; Eina_Bool ret = EINA_FALSE; - eo_do((Eo *) obj, elm_obj_win_available_profiles_get(&ret, profiles, count)); + eo_do((Eo *) obj, elm_obj_win_available_profiles_get(profiles, count, &ret)); return ret; } static void _available_profiles_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) { - Eina_Bool *ret = va_arg(*list, Eina_Bool *); char ***profiles = va_arg(*list, char ***); unsigned int *count = va_arg(*list, unsigned int *); + Eina_Bool *ret = va_arg(*list, Eina_Bool *); Elm_Win_Smart_Data *sd = _pd; Eina_Bool res; @@ -4079,7 +4079,7 @@ _available_profiles_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list) if (count) *count = sd->profile.count; res = EINA_TRUE; } - *ret = res; + if (ret) *ret = res; } EAPI void diff --git a/src/lib/elm_win_eo.h b/src/lib/elm_win_eo.h index 21e9430..e7f0dcd 100644 --- a/src/lib/elm_win_eo.h +++ b/src/lib/elm_win_eo.h @@ -538,13 +538,13 @@ enum * * Get the array of available profiles of a window. * - * @param[out] ret * @param[out] profiles * @param[out] count + * @param[out] ret * * @see elm_win_available_profiles_get */ -#define elm_obj_win_available_profiles_get(ret, profiles, count) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_AVAILABLE_PROFILES_GET), EO_TYPECHECK(Eina_Bool *, ret), EO_TYPECHECK(char ***, profiles), EO_TYPECHECK(unsigned int *, count) +#define elm_obj_win_available_profiles_get(profiles, count, ret) ELM_OBJ_WIN_ID(ELM_OBJ_WIN_SUB_ID_AVAILABLE_PROFILES_GET), EO_TYPECHECK(char ***, profiles), EO_TYPECHECK(unsigned int *, count), EO_TYPECHECK(Eina_Bool *, ret) /** * @def elm_obj_win_profile_set --
