diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-08-12 07:44:08 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-08-12 08:12:46 +0900 |
| commit | 170ca4d710a77e5d3d4caf74d4ae44d6c23ffe9b (patch) | |
| tree | 0e885ce00343d0429f56c8373fa638e631cfb6e4 | |
| parent | 105eb1aca236fda7e3f218aad112702838a0380e (diff) | |
| download | efl-170ca4d710a77e5d3d4caf74d4ae44d6c23ffe9b.tar.gz | |
elm_win: Fix ABI break with missing EAPIs
EAPI elm_win_type_set
EAPI elm_win_name_set
Those two APIs should never have been part of the legacy API,
but they have been generated since at least 1.16. The commits
1aceb3bc198f3f9a07671f37564efc6657fe2a41
and
41aa19447c2a324a8cca59799a0a058fea56b575
removed the legacy symbols generation. It seemed like a good
idea since the APIs shouldn't exist, but in fact this broke
ABI. I hate this. So sorry about it.
I'm adding them back in with no documentation and as
EINA_DEPRECATED.
This is an emergency commit before the 1.18.x release
announcement.
Fixes T4344
@fix
| -rw-r--r-- | src/lib/elementary/efl_ui_win.c | 15 | ||||
| -rw-r--r-- | src/lib/elementary/efl_ui_win.eo | 12 | ||||
| -rw-r--r-- | src/lib/elementary/elm_deprecated.h | 4 |
3 files changed, 19 insertions, 12 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index be5de246a2..8c2e1b1e8f 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -6979,4 +6979,19 @@ elm_win_aspect_get(const Eo *obj) return _win_aspect_get(sd); } +// deprecated +EAPI void +elm_win_name_set(Evas_Object *obj, const char *name) +{ + ERR("Calling deprecrated function '%s'", __FUNCTION__); + efl_ui_win_name_set(obj, name); +} + +EAPI void +elm_win_type_set(Evas_Object *obj, Elm_Win_Type type) +{ + ERR("Calling deprecrated function '%s'", __FUNCTION__); + efl_ui_win_type_set(obj, type); +} + #include "efl_ui_win.eo.c" diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 8617f75154..a1f1fcd61e 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -557,12 +557,6 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window, Note: Once set, it can NOT be modified afterward. ]] - /* FIXME-doc - Example: - @code - win = eo_add(ELM_WIN_CLASS, NULL, elm_obj_win_name_set(ELM_WIN_BASIC)); - @endcode - */ set { [[Can only be used at creation time, within \@ref eo_add.]] legacy: null; @@ -582,12 +576,6 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Elm.Interface.Atspi.Window, Note: Once set, it can NOT be modified afterward. ]] - /* FIXME-doc - Example: - @code - win = eo_add(ELM_WIN_CLASS, NULL, elm_obj_win_type_set(ELM_WIN_BASIC)); - @endcode - */ set { [[Can only be used at creation time, within \@ref eo_add.]] legacy: null; diff --git a/src/lib/elementary/elm_deprecated.h b/src/lib/elementary/elm_deprecated.h index 91c556cfa8..db62228e63 100644 --- a/src/lib/elementary/elm_deprecated.h +++ b/src/lib/elementary/elm_deprecated.h @@ -1640,3 +1640,7 @@ EINA_DEPRECATED EAPI const char *elm_fileselector_entry_selected_get(const Evas_ //TODO: remvoe below - use elm_access_text_set(); or elm_access_cb_set(); EINA_DEPRECATED EAPI void elm_access_external_info_set(Evas_Object *obj, const char *text); EINA_DEPRECATED EAPI char *elm_access_external_info_get(const Evas_Object *obj); + +// elm_win +EINA_DEPRECATED EAPI void elm_win_type_set(Evas_Object *obj, Elm_Win_Type type); +EINA_DEPRECATED EAPI void elm_win_name_set(Evas_Object *obj, const char *name); |