Revert "ecore-wl2 : apply ecore-wl2 feature for EFL120 migration"

This reverts commit 234884382f9da38a8b7ad35db1e0edd52eb9e2e1.

Change-Id: Icc97f4e783ffda6fc1ec6f54fbaabf718641b2a6

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 7d3dd11ed44bf76b51109e77668731343f6b06e1..a27a930f792e7f5260de3be95519de3faff1e01d 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -22,7 +22,7 @@ pkg_check_modules(viewer_dali REQUIRED
        dali-adaptor
        dali-toolkit
        cynara-client
-        ecore-wl2
+       ecore-wayland
        ecore-input
        tizen-remote-surface-client
        screen_connector_watcher

diff --git a/packaging/widget-viewer-dali.spec b/packaging/widget-viewer-dali.spec
index 7731d3a09839fbd36c1918b16eaf3bfe105c2850..ebfc6f51b5f33f60b43b0524428920777e25b31a 100644 (file)
--- a/packaging/widget-viewer-dali.spec
+++ b/packaging/widget-viewer-dali.spec
@@ -19,7 +19,7 @@ BuildRequires: pkgconfig(dali-core)
 BuildRequires: pkgconfig(dali-adaptor)
 BuildRequires: pkgconfig(dali-toolkit)
 BuildRequires: pkgconfig(cynara-client)
-BuildRequires: pkgconfig(ecore-wl2)
+BuildRequires: pkgconfig(ecore-wayland)
 BuildRequires: pkgconfig(wayland-tbm-client)
 BuildRequires: pkgconfig(screen_connector_watcher)
 

diff --git a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
index 202e5ab06d10a9fe0695056dbf990589fa45767e..422fb1696796539925c60807d789c6041afc987a 100644 (file)
--- a/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -34,10 +34,7 @@
 #include <dali/devel-api/events/touch-event-devel.h>
 #include <dali/devel-api/events/key-event-devel.h>
 #include <string.h>
-#ifndef EFL_BETA_API_SUPPORT
-#define EFL_BETA_API_SUPPORT
-#endif
-#include <Ecore_Wl2.h>
+#include <Ecore_Wayland.h>
 #include <Ecore_Input.h>
 #include <widget_service.h>
 #include <widget_instance.h>
@@ -157,19 +154,18 @@ static void FindKeyCode( struct xkb_keymap* keyMap, xkb_keycode_t key, void* dat
 static bool GetKeyCode( std::string keyName, int32_t& keyCode )
 {
   xkb_keymap* keyMap = NULL;
-  Ecore_Wl2_Input* ecoreWlInput = NULL;
+  Ecore_Wl_Input* ecoreWlInput = NULL;
   xkb_keysym_t sym = XKB_KEY_NoSymbol;
   KeyCodeMap foundKeyCode;
 
-  Ecore_Wl2_Display *wl2_display = ecore_wl2_connected_display_get(NULL);
-  ecoreWlInput = ecore_wl2_input_default_input_get(wl2_display);
+  ecoreWlInput = ecore_wl_input_get();
   if( !ecoreWlInput )
   {
-    DALI_LOG_ERROR( "Failed to get Ecore_Wl2_Input in WidgetView\n" );
+    DALI_LOG_ERROR( "Failed to get Ecore_Wl_Input in WidgetView\n" );
     return false;
   }
 
-  keyMap = ecore_wl2_input_keymap_get( ecoreWlInput );
+  keyMap = ecore_wl_input_keymap_get( ecoreWlInput );
   if( !keyMap )
   {
     DALI_LOG_ERROR( "Failed to get keymap in WidgetView\n" );