From c783825d653899153aca6bc995d795be3a4a2d18 Mon Sep 17 00:00:00 2001 From: Suyeon Hwang Date: Tue, 2 May 2017 11:34:08 +0900 Subject: [PATCH] Fix error getting conflict status Change-Id: I8c0bb2d99b15624e0f88a252388416006dc4efc0 Signed-off-by: Suyeon Hwang --- include/voice_control_webview.h | 1 - src/voice_control_webview.cpp | 6 ------ 2 files changed, 7 deletions(-) diff --git a/include/voice_control_webview.h b/include/voice_control_webview.h index 4c2fd00..ce87f8a 100755 --- a/include/voice_control_webview.h +++ b/include/voice_control_webview.h @@ -212,7 +212,6 @@ private: static vc_webview_result_cb m_result_cb; static Evas_Object *m_ewk_view; static int m_enable_navigation; - static int vc_conf_status; static efl_util_inputgen_h touch; void vc_register_commands(); int vc_add_command(const char*, const char*, vc_cmd_list_h &list); diff --git a/src/voice_control_webview.cpp b/src/voice_control_webview.cpp index eaa38fe..a6c775c 100755 --- a/src/voice_control_webview.cpp +++ b/src/voice_control_webview.cpp @@ -33,7 +33,6 @@ std::string m_custom_name; Evas_Object *VCWebView::m_ewk_view = NULL; vc_webview_result_cb VCWebView::m_result_cb = NULL; int VCWebView::m_enable_navigation = 0; -int VCWebView::vc_conf_status = 0; efl_util_inputgen_h VCWebView::touch; static vc_cmd_list_h m_list = NULL; @@ -716,11 +715,6 @@ int VCWebView::vc_get_conflict_status() Eina_Bool ret; int conflict = -1; - if (!vc_conf_status) { - LOGI("[INFO] Configuration does not set"); - return -1; - } - g_wait = true; ret = ewk_view_script_execute(m_ewk_view, "vc_get_conflict_status();", __js_script_conflict_result_cb, (void*)&conflict); -- 2.7.4