From e6e5e98c676315c8d51c52b643617d285b476f7d Mon Sep 17 00:00:00 2001 From: "sooyeon.kim" Date: Mon, 30 Jul 2018 14:48:54 +0900 Subject: [PATCH] Fix dbus delay when requesting hello Change-Id: I5417ce2db0e59a77895f3185348019c030279d19 Signed-off-by: sooyeon.kim --- client/stt_dbus.c | 2 +- server/sttd_dbus.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/client/stt_dbus.c b/client/stt_dbus.c index f589775..a707264 100644 --- a/client/stt_dbus.c +++ b/client/stt_dbus.c @@ -923,7 +923,7 @@ int stt_dbus_request_hello(int uid) } if (g_conn_sender) { - result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_short_time, &err); + result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, -1, &err); dbus_message_unref(msg); if (dbus_error_is_set(&err)) { SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Get arguments error (%s)", err.message); diff --git a/server/sttd_dbus.c b/server/sttd_dbus.c index d086d89..c234977 100644 --- a/server/sttd_dbus.c +++ b/server/sttd_dbus.c @@ -763,6 +763,11 @@ int sttd_dbus_open_connection() return STTD_ERROR_OPERATION_FAILED; } + /* Flush messages which are received before fd event handler registration */ + while (DBUS_DISPATCH_DATA_REMAINS == dbus_connection_get_dispatch_status(g_conn_listener)) { + listener_event_callback(NULL, NULL); + } + /* add a rule for getting signal */ char rule[128]; snprintf(rule, 128, "type='signal',interface='%s'", g_server_service_interface); -- 2.7.4