From: Jongmin Lee Date: Thu, 30 May 2019 05:45:10 +0000 (+0900) Subject: replace the use of ecore_wayland into ecore_wl2 X-Git-Tag: accepted/tizen/unified/20190602.221752^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7fa2ef21ad25c68dd3e892500fc7bda819e5c7d;p=platform%2Fcore%2Fuifw%2Fvoice-control.git replace the use of ecore_wayland into ecore_wl2 Change-Id: I8d276f76a313426f2d85bb5447d841e8baf78f90 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index ffeca96..67eb451 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,8 @@ EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH") ADD_DEFINITIONS("-DVOICE_LIBDIR=\"${LIBDIR}\"") ADD_DEFINITIONS("-Werror") +# for the use of ecore_wl2 +ADD_DEFINITIONS("-DEFL_BETA_API_SUPPORT") # pkg config tool INCLUDE(FindPkgConfig) @@ -45,12 +47,12 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") INCLUDE(FindPkgConfig) IF("${_TV_PRODUCT}" STREQUAL "TRUE") pkg_check_modules(pkgs REQUIRED - aul capi-appfw-app-control capi-appfw-app-manager capi-base-common capi-media-audio-io capi-media-sound-manager ecore-wayland + aul capi-appfw-app-control capi-appfw-app-manager capi-base-common capi-media-audio-io capi-media-sound-manager ecore-wl2 capi-network-bluetooth capi-network-bluetooth-tv capi-system-info cynara-client cynara-session dbus-1 db-util dlog ecore glib-2.0 json-glib-1.0 libgum libtzplatform-config libxml-2.0 sqlite3 vconf msfapi farfield-voice-api ) ELSE() pkg_check_modules(pkgs REQUIRED - aul capi-appfw-app-control capi-appfw-app-manager capi-base-common capi-media-audio-io capi-media-sound-manager ecore-wayland + aul capi-appfw-app-control capi-appfw-app-manager capi-base-common capi-media-audio-io capi-media-sound-manager ecore-wl2 capi-system-info cynara-client cynara-session dbus-1 db-util dlog ecore glib-2.0 json-glib-1.0 libgum libtzplatform-config libxml-2.0 sqlite3 vconf ) ENDIF() diff --git a/client/vc.c b/client/vc.c index b75d098..77f19a7 100644 --- a/client/vc.c +++ b/client/vc.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -251,7 +251,7 @@ static Eina_Bool __focus_changed_cb(void *data, int type, void *event) SLOG(LOG_DEBUG, TAG_VCC, "@@@ Focus changed"); int ret; - if (ECORE_WL_EVENT_FOCUS_IN == type) { + if (ECORE_WL2_EVENT_FOCUS_IN == type) { SLOG(LOG_DEBUG, TAG_VCC, "@@@ Set foreground"); ret = vc_dbus_set_foreground(getpid(), true); if (0 != ret) { @@ -274,7 +274,7 @@ static Eina_Bool __focus_changed_cb(void *data, int type, void *event) /* notify auth changed cb */ ecore_timer_add(0, __notify_auth_changed_cb, NULL); } - } else if (ECORE_WL_EVENT_FOCUS_OUT == type) { + } else if (ECORE_WL2_EVENT_FOCUS_OUT == type) { SLOG(LOG_DEBUG, TAG_VCW, "@@@ Set background"); ret = vc_dbus_set_foreground(getpid(), false); if (0 != ret) { @@ -534,8 +534,8 @@ static Eina_Bool __vc_connect_daemon(void *data) /* Register focus handler */ ecore_thread_main_loop_begin(); - g_focus_in_handler = ecore_event_handler_add(ECORE_WL_EVENT_FOCUS_IN, __focus_changed_cb, NULL); - g_focus_out_handler = ecore_event_handler_add(ECORE_WL_EVENT_FOCUS_OUT, __focus_changed_cb, NULL); + g_focus_in_handler = ecore_event_handler_add(ECORE_WL2_EVENT_FOCUS_IN, __focus_changed_cb, NULL); + g_focus_out_handler = ecore_event_handler_add(ECORE_WL2_EVENT_FOCUS_OUT, __focus_changed_cb, NULL); ecore_thread_main_loop_end(); char appid[1024] = {'\0',}; diff --git a/client/vc_widget.c b/client/vc_widget.c index c185aba..0fb7460 100644 --- a/client/vc_widget.c +++ b/client/vc_widget.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include "vc_cmd_db.h" #include "vc_command.h" #include "vc_config_mgr.h" @@ -327,13 +327,13 @@ static Eina_Bool __focus_changed_cb(void *data, int type, void *event) SLOG(LOG_DEBUG, TAG_VCW, "@@@ Focus changed"); int ret; - if (ECORE_WL_EVENT_FOCUS_IN == type) { + if (ECORE_WL2_EVENT_FOCUS_IN == type) { SLOG(LOG_DEBUG, TAG_VCW, "@@@ Set foreground"); ret = vc_widget_dbus_set_foreground(getpid(), true); if (0 != ret) { SLOG(LOG_ERROR, TAG_VCW, "[ERROR] Fail to set foreground (true) : %d", ret); } - } else if (ECORE_WL_EVENT_FOCUS_OUT == type) { + } else if (ECORE_WL2_EVENT_FOCUS_OUT == type) { SLOG(LOG_DEBUG, TAG_VCW, "@@@ Set background"); ret = vc_widget_dbus_set_foreground(getpid(), false); if (0 != ret) { @@ -354,9 +354,9 @@ static void __vc_widget_add_focus_event_handler(void *data) SLOG(LOG_INFO, TAG_VCW, "@@@ [Widget] add focus event handler"); if (NULL == g_focus_in_handler) - g_focus_in_handler = ecore_event_handler_add(ECORE_WL_EVENT_FOCUS_IN, __focus_changed_cb, NULL); + g_focus_in_handler = ecore_event_handler_add(ECORE_WL2_EVENT_FOCUS_IN, __focus_changed_cb, NULL); if (NULL == g_focus_out_handler) - g_focus_out_handler = ecore_event_handler_add(ECORE_WL_EVENT_FOCUS_OUT, __focus_changed_cb, NULL); + g_focus_out_handler = ecore_event_handler_add(ECORE_WL2_EVENT_FOCUS_OUT, __focus_changed_cb, NULL); return; } diff --git a/packaging/voice-control.spec b/packaging/voice-control.spec index 1115948..6014e70 100644 --- a/packaging/voice-control.spec +++ b/packaging/voice-control.spec @@ -23,7 +23,7 @@ BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(db-util) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(ecore) -BuildRequires: pkgconfig(ecore-wayland) +BuildRequires: pkgconfig(ecore-wl2) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libgum)