From: Wonnam Jang Date: Thu, 12 Jan 2017 02:22:45 +0000 (-0800) Subject: Merge "Remove unnecessary logs and files" into tizen X-Git-Tag: accepted/tizen/common/20170117.174608~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=597997d15093ec3bf074f3fc9f4813e15a77ea0e;hp=c5e07da4116f1e98593b4e0f078dc58a591b6a94;p=platform%2Fcore%2Fuifw%2Fstt.git Merge "Remove unnecessary logs and files" into tizen --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 767b057..c961bf1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(server) ## Test ## -ADD_SUBDIRECTORY(test) +#ADD_SUBDIRECTORY(test) ## Engine Parser ## ADD_SUBDIRECTORY(engine-parser) diff --git a/client/stt_dbus.c b/client/stt_dbus.c index fe1dc72..4406ac6 100644 --- a/client/stt_dbus.c +++ b/client/stt_dbus.c @@ -875,12 +875,12 @@ int stt_dbus_request_hello(int uid) } if (NULL == msg) { - SLOG(LOG_ERROR, TAG_STTC, ">>>> Request stt hello : Fail to make message"); - return STT_ERROR_OPERATION_FAILED; +// SLOG(LOG_ERROR, TAG_STTC, ">>>> Request stt hello : Fail to make message"); + result = stt_dbus_reconnect(); + if (0 != result) + return STT_ERROR_OPERATION_FAILED; } - - if (g_conn_sender) { result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_short_time, &err); dbus_message_unref(msg); @@ -907,6 +907,7 @@ int stt_dbus_request_hello(int uid) } } else { SLOG(LOG_WARN, TAG_STTC, "[WARN] dbus connection handle is null (%p)", g_conn_sender); + stt_dbus_reconnect(); result = STT_ERROR_OPERATION_FAILED; } diff --git a/packaging/stt.spec b/packaging/stt.spec index 358d33b..27bd80d 100644 --- a/packaging/stt.spec +++ b/packaging/stt.spec @@ -125,7 +125,7 @@ mkdir -p %{TZ_SYS_RO_SHARE}/voice/test %{TZ_SYS_RO_SHARE}/voice/stt/1.0/stt-config.xml %{TZ_SYS_RO_SHARE}/dbus-1/services/org.tizen.voice.sttserver.service %{TZ_SYS_RO_SHARE}/dbus-1/services/org.tizen.voice.sttservercustom.service -%{TZ_SYS_RO_SHARE}/voice/test/stt-test +#%{TZ_SYS_RO_SHARE}/voice/test/stt-test %{TZ_SYS_RO_SHARE}/license/%{name} #%{TZ_SYS_BIN}/* %{_bindir}/voice_getengine