vitorsousa pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d4479b3f55e7008d212646102bcd209258800a12
commit d4479b3f55e7008d212646102bcd209258800a12 Author: Vitor Sousa <[email protected]> Date: Mon Jul 4 17:17:38 2016 -0300 elementary/fileselector: Fix legacy path set/get of Fileselector.Entry --- src/lib/elementary/elc_fileselector_button.c | 21 ++++++++++++++++----- src/lib/elementary/elc_fileselector_entry.c | 6 +++--- src/lib/elementary/elm_interface_fileselector.h | 6 ++++++ 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/lib/elementary/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c index 38757fe..8ae9ecb 100644 --- a/src/lib/elementary/elc_fileselector_button.c +++ b/src/lib/elementary/elc_fileselector_button.c @@ -320,9 +320,8 @@ elm_fileselector_button_window_size_get(const Eo *obj, Evas_Coord *width, Evas_C if (height) *height = sd->h; } -EINA_DEPRECATED EAPI void -elm_fileselector_button_path_set(Evas_Object *obj, - const char *path) +void +_elm_fileselector_button_path_set_internal(Evas_Object *obj, const char *path) { ELM_FILESELECTOR_INTERFACE_CHECK(obj); ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN(obj, sd); @@ -343,6 +342,12 @@ elm_fileselector_button_path_set(Evas_Object *obj, if (sd->fs) elm_interface_fileselector_selected_model_set(sd->fs, model, NULL); } +EINA_DEPRECATED EAPI void +elm_fileselector_button_path_set(Evas_Object *obj, const char *path) +{ + _elm_fileselector_button_path_set_internal(obj, path); +} + EOLIAN static void _elm_fileselector_button_elm_interface_fileselector_model_set(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd, Efl_Model *model) { @@ -365,14 +370,20 @@ _elm_fileselector_button_elm_interface_fileselector_model_set(Eo *obj EINA_UNUSE if (sd->fs) elm_interface_fileselector_selected_model_set(sd->fs, model, NULL); } -EINA_DEPRECATED EAPI const char * -elm_fileselector_button_path_get(const Evas_Object *obj) +const char * +_elm_fileselector_button_path_get_internal(const Evas_Object *obj) { ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL); ELM_FILESELECTOR_BUTTON_DATA_GET_OR_RETURN_VAL(obj, sd, NULL); return sd->fsd.path; } +EINA_DEPRECATED EAPI const char * +elm_fileselector_button_path_get(const Evas_Object *obj) +{ + return _elm_fileselector_button_path_get_internal(obj); +} + EOLIAN static Efl_Model * _elm_fileselector_button_elm_interface_fileselector_model_get(Eo *obj EINA_UNUSED, Elm_Fileselector_Button_Data *sd) { diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c index 616c839..a0edf25 100644 --- a/src/lib/elementary/elc_fileselector_entry.c +++ b/src/lib/elementary/elc_fileselector_entry.c @@ -401,7 +401,7 @@ elm_fileselector_entry_selected_set(Evas_Object *obj, const char *path) { ELM_FILESELECTOR_INTERFACE_CHECK(obj); ELM_FILESELECTOR_ENTRY_DATA_GET_OR_RETURN(obj, sd); - elm_fileselector_path_set(sd->button, path); + _elm_fileselector_button_path_set_internal(sd->button, path); } EOLIAN static void @@ -419,7 +419,7 @@ elm_fileselector_entry_selected_get(const Evas_Object *obj) { ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL); ELM_FILESELECTOR_ENTRY_DATA_GET_OR_RETURN_VAL(obj, sd, NULL); - return elm_fileselector_path_get(sd->button); + return _elm_fileselector_button_path_get_internal(sd->button); } EOLIAN static Efl_Model * @@ -475,7 +475,7 @@ elm_fileselector_entry_path_set(Evas_Object *obj, free(s); } - elm_fileselector_path_set(sd->button, path); + _elm_fileselector_button_path_set_internal(sd->button, path); } static void diff --git a/src/lib/elementary/elm_interface_fileselector.h b/src/lib/elementary/elm_interface_fileselector.h index 31b2bde..731dd51 100644 --- a/src/lib/elementary/elm_interface_fileselector.h +++ b/src/lib/elementary/elm_interface_fileselector.h @@ -12,4 +12,10 @@ return __VA_ARGS__; \ } +void +_elm_fileselector_button_path_set_internal(Evas_Object *obj, const char *path); + +const char * +_elm_fileselector_button_path_get_internal(const Evas_Object *obj); + #endif --
