Replace ecore_wayland API to ecore_wl2 API

Change-Id: I0881635bd401f9d34b8a8ef3361f79d6dc782741
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b1c93b..ee2ed4f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ pkg_check_modules(pkgs REQUIRED
        capi-system-device
        vconf
        capi-ui-efl-util
-       ecore-wayland)
+       ecore-wl2)
 ELSEIF("$ENV{CFLAGS}" MATCHES "-DTIZEN_PROFILE_MOBILE")
 pkg_check_modules(pkgs REQUIRED
        capi-appfw-application
@@ -79,7 +79,7 @@ pkg_check_modules(pkgs REQUIRED
        edbus
        vconf
        capi-ui-efl-util
-       ecore-wayland)
+       ecore-wl2)
 ENDIF()
 
 FOREACH(flag ${pkgs_CFLAGS})

diff --git a/packaging/org.tizen.bt-syspopup.spec b/packaging/org.tizen.bt-syspopup.spec
index 02ee786..524feb3 100644 (file)
--- a/packaging/org.tizen.bt-syspopup.spec
+++ b/packaging/org.tizen.bt-syspopup.spec
@@ -5,7 +5,7 @@
 
 Name:       org.tizen.bt-syspopup
 Summary:    bluetooth system-popup application (bluetooth system popup)
-Version:    0.3.2
+Version:    0.5.1
 Release:    0
 Group:      main
 License:    Flora-1.1
@@ -45,7 +45,7 @@ BuildRequires:  pkgconfig(capi-media-player)
 BuildRequires:  pkgconfig(deviced)
 BuildRequires:  pkgconfig(capi-network-bluetooth)
 BuildRequires:  pkgconfig(vconf)
-BuildRequires:  pkgconfig(ecore-wayland)
+BuildRequires:  pkgconfig(ecore-wl2)
 BuildRequires:  pkgconfig(capi-ui-efl-util)
 
 BuildRequires:  cmake
@@ -96,6 +96,7 @@ export CFLAGS="$CFLAGS_BASE -DTIZEN_ENGINEER_MODE -DTIZEN_PROFILE_WEARABLE"
 export CXXFLAGS="$CXXFLAGS_BASE -DTIZEN_ENGINEER_MODE"
 export FFLAGS="$FFLAGS_BASE -DTIZEN_ENGINEER_MODE"
 
+export CFLAGS+=" -DEFL_BETA_API_SUPPORT "
 cmake .. \
     -DCMAKE_INSTALL_PREFIX=%{TZ_SYS_RO_APP}/org.tizen.bt-syspopup \
 %if %{with wayland}
@@ -121,6 +122,7 @@ export CFLAGS="$CFLAGS_BASE -DTIZEN_DEBUG_ENABLE -DTIZEN_PROFILE_MOBILE"
 export CXXFLAGS="$CXXFLAGS_BASE -DTIZEN_DEBUG_ENABLE"
 export FFLAGS="$FFLAGS_BASE -DTIZEN_DEBUG_ENABLE"
 
+export CFLAGS+=" -DEFL_BETA_API_SUPPORT "
 cmake . \
     -DCMAKE_INSTALL_PREFIX=%{TZ_SYS_RO_APP}/org.tizen.bt-syspopup \
 %if %{with wayland}

diff --git a/src/bt-syspopup-m.c b/src/bt-syspopup-m.c
index c1b8fe1..6f309bc 100644 (file)
--- a/src/bt-syspopup-m.c
+++ b/src/bt-syspopup-m.c
@@ -43,7 +43,7 @@
 #include <gio/gio.h>
 #include <gio/giotypes.h>
 #include <efl_util.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 
 #include "bt-syspopup-m.h"
 
@@ -2437,12 +2437,12 @@ static void __bluetooth_set_win_level(Evas_Object *parent)
        ret_if(!parent);
        BT_DBG("Setting window type");
 
-       Ecore_Wl_Window * wl_win = NULL;
+       Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(parent));
+       Ecore_Wl2_Window *wl_win = ecore_evas_wayland2_window_get(ee);
 
-       wl_win = elm_win_wl_window_get(parent);
        ret_if(!wl_win);
 
-       ecore_wl_window_type_set(wl_win, ECORE_WL_WINDOW_TYPE_NOTIFICATION);
+       ecore_wl2_window_type_set(wl_win, ECORE_WL2_WINDOW_TYPE_NOTIFICATION);
        efl_util_set_notification_window_level(parent, EFL_UTIL_NOTIFICATION_LEVEL_HIGH);
 }
 

diff --git a/src/bt-syspopup-w.c b/src/bt-syspopup-w.c
index 380b9bd..90043cc 100644 (file)
--- a/src/bt-syspopup-w.c
+++ b/src/bt-syspopup-w.c
@@ -39,7 +39,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include <efl_util.h>
-#include <Ecore_Wayland.h>
+#include <Ecore_Wl2.h>
 
 #define COLOR_TABLE "/usr/apps/org.tizen.bt-syspopup/shared/res/tables/com.samsung.bt-syspopup_ChangeableColorTable.xml"
 #define FONT_TABLE "/usr/apps/org.tizen.bt-syspopup/shared/res/tables/com.samsung.bt-syspopup_FontInfoTable.xml"
@@ -155,12 +155,11 @@ static void __bluetooth_cleanup(struct bt_popup_appdata *ad)
 
 static void __bluetooth_set_win_level(Evas_Object *parent)
 {
-       Ecore_Wl_Window * wl_win = NULL;
-
-       wl_win = (void *)elm_win_wl_window_get(parent);
+       Ecore_Evas *ee = ecore_evas_ecore_evas_get(evas_object_evas_get(parent));
+       Ecore_Wl2_Window *wl_win = ecore_evas_wayland2_window_get(ee);
        ret_if(!wl_win);
 
-       ecore_wl_window_type_set(wl_win, ECORE_WL_WINDOW_TYPE_NOTIFICATION);
+       ecore_wl2_window_type_set(wl_win, ECORE_WL2_WINDOW_TYPE_NOTIFICATION);
        efl_util_set_notification_window_level(parent, EFL_UTIL_NOTIFICATION_LEVEL_HIGH);
 }