WIP: disable obsolete weston-1.4 53/23553/1 tizen_3.0.m14.2_ivi submit/tizen_ivi/20140626.144348 submit/tizen_ivi/20140627.063632 tizen_3.0.m14.2_ivi_release
authorPhilippe Coval <philippe.coval@open.eurogiciel.org>
Fri, 27 Jun 2014 09:45:47 +0000 (11:45 +0200)
committerPhilippe Coval <philippe.coval@open.eurogiciel.org>
Fri, 27 Jun 2014 09:45:47 +0000 (11:45 +0200)
This was needed to make it build again on weston-1.5 base
patch maybe reverted if code is upgraded

Change-Id: I9fdf4634ad152dd92058733925f1d59eca8398d5
Bug-Tizen: TC-1208
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
lib/system-controller/CicoSCWlWinMgrIF.cpp

index 88771f2..6780b23 100644 (file)
@@ -42,6 +42,16 @@ int CicoSCWlWinMgrIF::m_id_surface = 0;
 struct creation_surface_wait    *CicoSCWlWinMgrIF::m_wait_surface_creation = NULL;
 struct creation_surface_wait    *CicoSCWlWinMgrIF::m_free_surface_creation = NULL;
 
+#ifndef CONFIG_LOCAL_WESTON14
+namespace {
+  void ivi_controller_get_native_handle(struct ivi_controller *m_ivi_ctrl, int32_t pid, const char *title)
+  {
+    ICO_ERR("unsupported code: https://bugs.tizen.org/jira/browse/TC-1208");
+    exit(-1);
+  }
+}
+#endif
+
 //--------------------------------------------------------------------------
 /**
  *  @brief  default constructor
@@ -63,7 +73,9 @@ CicoSCWlWinMgrIF::CicoSCWlWinMgrIF()
     m_ivi_ctrl_listener.layer = wlIviCtrlLayerCB;
     m_ivi_ctrl_listener.surface = wlIviCtrlSurfaceCB;
     m_ivi_ctrl_listener.error = wlIviCtrlErrorCB;
+#ifdef CONFIG_LOCAL_WESTON14
     m_ivi_ctrl_listener.native_handle = wlIviCtrlNativeHandleCB;
+#endif
 
     // wayland output listener
     m_wlOutputListener.geometry = wlOutputGeometryCB;