From 9864693a8139ecb395ffdddd2e2eb66064105123 Mon Sep 17 00:00:00 2001 From: Wonki Kim Date: Mon, 8 Aug 2016 19:45:52 +0900 Subject: [PATCH] conform: Fix build break on X backend. Wayland specific APIs has been added previous commit. then the APIs break the build on X backend. this commit fix that issue. Change-Id: I2b7cc5968b1facfe11ff1a0068661fcef39eb2f0 Signed-off-by: Wonki Kim --- src/lib/elm_conform.c | 15 ++++++++++----- src/lib/elm_win.c | 4 +++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c index 4f07382..63b9411 100644 --- a/src/lib/elm_conform.c +++ b/src/lib/elm_conform.c @@ -585,16 +585,14 @@ _create_landscape_indicator(Evas_Object *obj) } // TIZEN_ONLY(20160801): indicator implementation +#ifdef HAVE_ELEMENTARY_WAYLAND static Eina_Bool _indicator_visible_type_set(Evas_Object *obj, Eina_Bool visible) { - Evas_Object *top = NULL; - Ecore_Wl_Window *wlwin = NULL; - - top = elm_widget_top_get(obj); + Evas_Object *top = elm_widget_top_get(obj); if (!top) return EINA_FALSE; - wlwin = elm_win_wl_window_get(top); + Ecore_Wl_Window *wlwin = elm_win_wl_window_get(top); if (!wlwin) return EINA_FALSE; if (visible) @@ -607,6 +605,7 @@ _indicator_visible_type_set(Evas_Object *obj, Eina_Bool visible) } return EINA_TRUE; } +#endif static Eina_Bool _indicator_hide_effect(void *data) { @@ -621,7 +620,9 @@ _indicator_hide_effect(void *data) (sd->ind_o_mode == ELM_WIN_INDICATOR_TRANSPARENT)) { elm_object_signal_emit(conformant, "indicator,hide,effect", "elm"); +#ifdef HAVE_ELEMENTARY_WAYLAND _indicator_visible_type_set(data, EINA_FALSE); +#endif } return ECORE_CALLBACK_CANCEL; } @@ -644,7 +645,9 @@ _indicator_post_appearance_changed(Evas_Object *conformant) if((sd->indmode != ELM_WIN_INDICATOR_SHOW)) { +#ifdef HAVE_ELEMENTARY_WAYLAND _indicator_visible_type_set(conformant, EINA_FALSE); +#endif return; } @@ -652,7 +655,9 @@ _indicator_post_appearance_changed(Evas_Object *conformant) (sd->indmode == ELM_WIN_INDICATOR_UNKNOWN)) return; +#ifdef HAVE_ELEMENTARY_WAYLAND _indicator_visible_type_set(conformant, EINA_TRUE); +#endif _indicator_show_effect(conformant, 3); } // END diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index f7b1244..c9d42d5 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -3628,7 +3628,8 @@ elm_win_precreated_object_get(void) } // -// TIZEN_ONLY(20160728): Indicator Impelementation +// TIZEN_ONLY(20160728): Indicator Implementation +#ifdef HAVE_ELEMENTARY_WAYLAND static Eina_Bool _elm_win_wl_indicator_flick(void *data, int type EINA_UNUSED, void *event) { @@ -3636,6 +3637,7 @@ _elm_win_wl_indicator_flick(void *data, int type EINA_UNUSED, void *event) evas_object_smart_callback_call(sd->obj, SIG_INDICATOR_FLICK_DONE, NULL); return ECORE_CALLBACK_PASS_ON; } +#endif // END EAPI Evas_Object * -- 2.7.4