diff options
| author | Semun Lee <semun.lee@samsung.com> | 2017-04-27 22:51:16 +0900 |
|---|---|---|
| committer | Semun Lee <semun.lee@samsung.com> | 2017-04-27 22:52:10 +0900 |
| commit | d8f5c19874fee5e5846cb22010bf07599c01a283 (patch) | |
| tree | c78c7793f22d02447838ed508a49ee66736b652d | |
| parent | 7795c4d6c7066a5aedc1f9040d07ed53754ad51a (diff) | |
| download | app-core-d8f5c19874fee5e5846cb22010bf07599c01a283.tar.gz app-core-d8f5c19874fee5e5846cb22010bf07599c01a283.tar.bz2 app-core-d8f5c19874fee5e5846cb22010bf07599c01a283.zip | |
Revert "Add codes for setting voice touch as auto mode"
This reverts commit 93dcf128086a8732a9a236f1a8631b8423556206.
Change-Id: I836306b5f69b0de48daf6ee190b75600838e1f62
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | packaging/app-core.spec | 1 | ||||
| -rw-r--r-- | src/ui_base/appcore_ui_base.c | 26 |
3 files changed, 1 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bc52ac3..6c91c98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ SET(SRCS_efl src/legacy/appcore-efl.c src/ui_base/appcore_ui_base.c src/ui_base/ SET(HEADERS_efl appcore-efl.h appcore_ui_base.h) INCLUDE(FindPkgConfig) -SET(APPCORE_PKG_CHECK_MODULES2 "elementary dlog ecore gobject-2.0 glib-2.0 aul pkgmgr-info ttrace capi-system-info voice-control-elm") +SET(APPCORE_PKG_CHECK_MODULES2 "elementary dlog ecore gobject-2.0 glib-2.0 aul pkgmgr-info ttrace capi-system-info") pkg_check_modules(pkg_efl REQUIRED ${APPCORE_PKG_CHECK_MODULES2}) diff --git a/packaging/app-core.spec b/packaging/app-core.spec index cf96156..5724fcc 100644 --- a/packaging/app-core.spec +++ b/packaging/app-core.spec @@ -24,7 +24,6 @@ BuildRequires: pkgconfig(pkgmgr-info) BuildRequires: pkgconfig(ttrace) BuildRequires: cmake BuildRequires: pkgconfig(capi-system-info) -BuildRequires: pkgconfig(voice-control-elm) %description SLP common application basic diff --git a/src/ui_base/appcore_ui_base.c b/src/ui_base/appcore_ui_base.c index 8872ac4..8a03188 100644 --- a/src/ui_base/appcore_ui_base.c +++ b/src/ui_base/appcore_ui_base.c @@ -43,8 +43,6 @@ #include <aul_svc.h> #include <bundle_internal.h> #include <ttrace.h> -#include <voice_control_elm.h> -#include <voice_control_elm_private.h> #include "appcore_base.h" #include "appcore_ui_base.h" @@ -687,8 +685,6 @@ EXPORT_API int appcore_ui_base_init(appcore_ui_base_ops ops, int argc, char **ar const char *bg_launch; bundle *b; char appid[PATH_MAX] = {0, }; - int r; - bool is_vc_vt_automode = false; appcore_ui_plugin_init(&ops, &hint); aul_app_get_appid_bypid(getpid(), appid, sizeof(appid)); @@ -703,16 +699,6 @@ EXPORT_API int appcore_ui_base_init(appcore_ui_base_ops ops, int argc, char **ar LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:main:done]", appid); elm_init(argc, argv); - r = vc_elm_is_supported_vt_auto(&is_vc_vt_automode); - if (r != 0) { - _ERR("[VC] Fail to get vconfkey of vt_automode"); - } else { - if (is_vc_vt_automode == true) { - vc_elm_initialize(); - vc_elm_set_auto_register_mode(2, 0); - } - } - if (__context.hint & APPCORE_UI_BASE_HINT_HW_ACC_CONTROL) { hwacc = getenv("HWACC"); @@ -745,9 +731,6 @@ EXPORT_API int appcore_ui_base_init(appcore_ui_base_ops ops, int argc, char **ar EXPORT_API void appcore_ui_base_fini(void) { - bool is_vc_vt_automode = false; - int r; - appcore_base_fini(); appcore_ui_plugin_fini(); @@ -761,15 +744,6 @@ EXPORT_API void appcore_ui_base_fini(void) ecore_event_handler_del(__context.hlower); __finish_wl(); - - r = vc_elm_is_supported_vt_auto(&is_vc_vt_automode); - if (r != 0) { - _ERR("[VC] Fail to get vconfkey of vt_automode"); - } else { - if (is_vc_vt_automode == true) - vc_elm_deinitialize(); - } - elm_shutdown(); /* Check loader case */ |