Fix tv profile build error

Change if statements to make indicator work on only Mobile profile

Signed-off-by: minho.sun <minho.sun@samsung.com>
Change-Id: Ie20f3f6f1a805b923d2010741ebed9b222109c5f

diff --git a/adaptors/ecore/common/ecore-indicator-impl.cpp b/adaptors/ecore/common/ecore-indicator-impl.cpp
index 9a4c690..b954b69 100644 (file)
--- a/adaptors/ecore/common/ecore-indicator-impl.cpp
+++ b/adaptors/ecore/common/ecore-indicator-impl.cpp
@@ -310,11 +310,13 @@ struct Indicator::Impl
   : mIndicator(indicator),
     mEcoreEventHandler(NULL)
   {
-#if defined(WAYLAND) && defined(DALI_PROFILE_MOBILE)
+#if defined(DALI_PROFILE_MOBILE)
+#if defined(WAYLAND)
     mEcoreEventHandler = ecore_event_handler_add(ECORE_WL_EVENT_INDICATOR_FLICK,  EcoreEventIndicator, this);
-#elif !defined(DALI_PROFILE_UBUNTU)
+#else
     mEcoreEventHandler = ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE,  EcoreEventClientMessage, this);
 #endif
+#endif // WAYLAND && DALI_PROFILE_MOBILE
   }
 
   /**
@@ -354,8 +356,8 @@ struct Indicator::Impl
       }
     }
   }
-
-#if defined(WAYLAND) && defined(DALI_PROFILE_MOBILE)
+#if defined(DALI_PROFILE_MOBILE)
+#if defined(WAYLAND)
   /**
    * Called when the Ecore indicator event is received.
    */
@@ -364,7 +366,7 @@ struct Indicator::Impl
     SetIndicatorVisibility( data, INDICATOR_STAY_WITH_DURATION );
     return ECORE_CALLBACK_PASS_ON;
   }
-#elif !defined(DALI_PROFILE_UBUNTU)
+#else
   /**
    * Called when the client messages (i.e. quick panel state) are received.
    */
@@ -385,7 +387,7 @@ struct Indicator::Impl
     }
     return ECORE_CALLBACK_PASS_ON;
   }
-
+#endif
 #endif // WAYLAND && DALI_PROFILE_MOBILE
 
   // Data

diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
index ed8df95..4738eec 100644 (file)
--- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
@@ -349,6 +349,7 @@ void Window::SetIndicatorProperties( bool isShow, Dali::Window::WindowOrientatio
 
 void Window::IndicatorTypeChanged(Indicator::Type type)
 {
+#if defined(DALI_PROFILE_MOBILE)
   ECore::WindowRenderSurface* wlSurface( dynamic_cast< ECore::WindowRenderSurface * >( mSurface ) );
 
   if( wlSurface )
@@ -369,6 +370,7 @@ void Window::IndicatorTypeChanged(Indicator::Type type)
         break;
     }
   }
+#endif //MOBILE
 }
 
 void Window::IndicatorClosed( IndicatorInterface* indicator )