elm_win, elm_conform: add HAVE_ELEMENTARY_WAYLAND option.

Signed-off-by: Hosang Kim <hosang12.kim@samsung.com>
Change-Id: Id67da191b3c537170953f507470b709fca14d98b

diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c
index 7d90f13..8b47112 100644 (file)
--- a/src/lib/elm_conform.c
+++ b/src/lib/elm_conform.c
@@ -935,6 +935,7 @@ _on_prop_change(void *data,
 #endif
 
 // TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
+#ifdef HAVE_ELEMENTARY_WAYLAND
 static void
 _on_conformant_changed(void *data,
                      Evas_Object *obj,
@@ -979,6 +980,7 @@ _on_conformant_changed(void *data,
         _conformant_part_sizing_eval(data, ELM_CONFORMANT_VIRTUAL_KEYPAD_PART);
      }
 }
+#endif
 //
 
 EOLIAN static void
@@ -1023,8 +1025,10 @@ _elm_conformant_evas_object_smart_del(Eo *obj, Elm_Conformant_Data *sd)
          eo_event_callback_del(ELM_WIN_EVENT_ROTATION_CHANGED,
             _on_rotation_changed, obj));
    // TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
+#ifdef HAVE_ELEMENTARY_WAYLAND
    evas_object_smart_callback_del_full
      (sd->win, "conformant,changed", _on_conformant_changed, obj);
+#endif
    //
 
    eo_do_super(obj, MY_CLASS, evas_obj_smart_del());
@@ -1121,8 +1125,10 @@ _elm_conformant_eo_base_constructor(Eo *obj, Elm_Conformant_Data *sd)
          eo_event_callback_add(ELM_WIN_EVENT_ROTATION_CHANGED,
             _on_rotation_changed, obj));
    // TIZEN_ONLY(20150707): implemented elm_win_conformant_set/get for wayland
+#ifdef HAVE_ELEMENTARY_WAYLAND
    evas_object_smart_callback_add
      (sd->win, "conformant,changed", _on_conformant_changed, obj);
+#endif
    //
 
    return obj;

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 5a1510a..272527a 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -259,7 +259,9 @@ static const char SIG_INDICATOR_PROP_CHANGED[] = "indicator,prop,changed";
 static const char SIG_ROTATION_CHANGED[] = "rotation,changed";
 static const char SIG_PROFILE_CHANGED[] = "profile,changed";
 static const char SIG_WM_ROTATION_CHANGED[] = "wm,rotation,changed";
+#ifdef HAVE_ELEMENTARY_WAYLAND
 static const char SIG_CONFORMANT_CHANGED[] = "conformant,changed";
+#endif
 static const char SIG_AUX_HINT_ALLOWED[] = "aux,hint,allowed";
 static const char SIG_VISIBILITY_CHANGED[] = "visibility,changed";
 static const char SIG_EFFECT_STARTED[] = "effect,started";
@@ -286,7 +288,9 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
    {SIG_WM_ROTATION_CHANGED, ""},
    {SIG_WIDGET_FOCUSED, ""}, /**< handled by elm_widget */
    {SIG_WIDGET_UNFOCUSED, ""}, /**< handled by elm_widget */
+#ifdef HAVE_ELEMENTARY_WAYLAND
    {SIG_CONFORMANT_CHANGED, ""},
+#endif
    {SIG_AUX_HINT_ALLOWED, ""},
    {SIG_VISIBILITY_CHANGED, ""},
    {SIG_EFFECT_STARTED, ""},
@@ -1338,7 +1342,9 @@ _elm_win_state_change(Ecore_Evas *ee)
    Eina_Bool ch_maximized = EINA_FALSE;
    Eina_Bool ch_profile = EINA_FALSE;
    Eina_Bool ch_wm_rotation = EINA_FALSE;
+#ifdef HAVE_ELEMENTARY_WAYLAND
    Eina_Bool ch_conformant  = EINA_FALSE;
+#endif
    Eina_Bool ch_visibility = EINA_FALSE;
    Eina_Bool ch_aux_hint = EINA_FALSE;
    Eina_List *aux_hints = NULL;
@@ -1526,11 +1532,13 @@ _elm_win_state_change(Ecore_Evas *ee)
         eo_do(obj, eo_event_callback_call
           (ELM_WIN_EVENT_WM_ROTATION_CHANGED, NULL));
      }
+#ifdef HAVE_ELEMENTARY_WAYLAND
    if (ch_conformant)
      {
         evas_object_smart_callback_call(obj, SIG_CONFORMANT_CHANGED, (void *)property); //TIZEN_ONLY(20160330): add processing properties of window
 
      }
+#endif
    if (ch_aux_hint)
      {
         void *id;