From 967fd49e41d3e9319b8583662eeb36417ad3508e Mon Sep 17 00:00:00 2001
From: Ji-hoon Lee <dalton.lee@samsung.com>
Date: Tue, 10 Apr 2018 14:13:44 +0900
Subject: [PATCH] Apply EFL 1.20 upgrade

Change-Id: Icafcba8df9e04bb1d3283cb0de869b3cafe917cb
---
 src/legacy_support/websocket.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/legacy_support/websocket.cpp b/src/legacy_support/websocket.cpp
index 6f5dee2..ada9e47 100644
--- a/src/legacy_support/websocket.cpp
+++ b/src/legacy_support/websocket.cpp
@@ -36,7 +36,8 @@
 #include <libwebsockets.h>
 
 #ifdef WAYLAND
-#include <Ecore_Wayland.h>
+#define EFL_BETA_API_SUPPORT
+#include <Ecore_Wl2.h>
 #endif
 
 #define WEBSOCKET_PORT 7681
@@ -1168,13 +1169,17 @@ void CWebHelperAgentWebSocket::handle_recved_message(ISE_MESSAGE &message)
              * So here we are adjusting the height value when the requested keyboard size
              * is the same with the screen size, as a workaround */
             int scr_w = 0, scr_h = 0;
-            ecore_wl_sync();
-            ecore_wl_screen_size_get(&scr_w, &scr_h);
-            if (scr_w == portrait_width && scr_h == portrait_height) {
-                portrait_height -= 1;
-            }
-            if (scr_h == landscape_width && scr_w == landscape_height) {
-                landscape_height -= 1;
+            ecore_wl2_sync();
+            Ecore_Wl2_Display *ewd = NULL;
+            if ((ewd = ecore_wl2_connected_display_get(NULL))) {
+                ecore_wl2_display_screen_size_get(ewd, &scr_w, &scr_h);
+
+                if (scr_w == portrait_width && scr_h == portrait_height) {
+                    portrait_height -= 1;
+                }
+                if (scr_h == landscape_width && scr_w == landscape_height) {
+                    landscape_height -= 1;
+                }
             }
 #endif
 
-- 
2.34.1