diff options
author | Hwankyu Jhun <h.jhun@samsung.com> | 2018-01-10 16:52:15 +0900 |
---|---|---|
committer | Hwankyu Jhun <h.jhun@samsung.com> | 2018-01-10 16:52:15 +0900 |
commit | 19477d0b435db049ac805385822398004157f6b0 (patch) | |
tree | a4a5cfb1ec3e58e0dee9c9d9062eae38d9097aa6 /src | |
parent | 47c186ef3fd29e34e11a9915625c5925703cf5be (diff) | |
download | ui-gadget-1-19477d0b435db049ac805385822398004157f6b0.tar.gz ui-gadget-1-19477d0b435db049ac805385822398004157f6b0.tar.bz2 ui-gadget-1-19477d0b435db049ac805385822398004157f6b0.zip |
EFL_UPGRADE: remove ecore-wayland dependencysandbox/upgrade/efl120
Change-Id: I2409c6ceedc34e46df591d2986058aa541512c3a
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/manager.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/manager.c b/src/manager.c index 5ee7416..daf2914 100644 --- a/src/manager.c +++ b/src/manager.c @@ -25,7 +25,7 @@ #include <errno.h> #include <glib.h> #include <Elementary.h> -#include <Ecore_Wayland.h> +#include <Ecore_Wl2.h> #include <Ecore.h> #include "ug.h" @@ -392,24 +392,32 @@ static int ugman_ug_resume(void *data) static void _ugman_enable_indicator(Evas_Object *win, int enable) { - Ecore_Wl_Window *wlwin = elm_win_wl_window_get(win); + /* + * Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(win)); + * Ecore_Wl2_Window *wlwin = ecore_evas_wayland2_window_get(ee); + */ + Ecore_Wl2_Window *wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(win); if (enable == 1) - ecore_wl_window_indicator_state_set(wlwin, ECORE_WL_INDICATOR_STATE_ON); + ecore_wl2_window_indicator_state_set(wlwin, ECORE_WL2_INDICATOR_STATE_ON); else - ecore_wl_window_indicator_state_set(wlwin, ECORE_WL_INDICATOR_STATE_OFF); + ecore_wl2_window_indicator_state_set(wlwin, ECORE_WL2_INDICATOR_STATE_OFF); } static int _ugman_get_indicator_state(Evas_Object *win) { - Ecore_Wl_Window *wlwin = elm_win_wl_window_get(win); - Ecore_Wl_Indicator_State state; + /* + * Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(win)); + * Ecore_Wl2_Window *wlwin = ecore_evas_wayland2_window_get(ee); + */ + Ecore_Wl2_Window *wlwin = (Ecore_Wl2_Window *)elm_win_wl_window_get(win); + Ecore_Wl2_Indicator_State state; int ret; - state = ecore_wl_window_indicator_state_get(wlwin); - if (state == ECORE_WL_INDICATOR_STATE_OFF) + state = ecore_wl2_window_indicator_state_get(wlwin); + if (state == ECORE_WL2_INDICATOR_STATE_OFF) ret = 0; - else if (state == ECORE_WL_INDICATOR_STATE_ON) + else if (state == ECORE_WL2_INDICATOR_STATE_ON) ret = 1; else ret = -1; |