Modified dbus timeout value to prevent deadlock

Change-Id: I4ed3ba0830c0a9cb2baa95d4c4c01efc382f2c7b
Signed-off-by: kmook <kmook.choi@samsung.com>

diff --git a/common/Types.h b/common/Types.h
index 09a9526..72da8a5 100644 (file)
--- a/common/Types.h
+++ b/common/Types.h
@@ -34,6 +34,7 @@
 #define DBUS_PATH              "/org/tizen/d2dconv"
 #define DBUS_IFACE             "org.tizen.d2dconv"
 #define DBUS_TIMEOUT   3000000
+#define DBUS_TIMEOUT_CALL      3000
 
 #define METHOD_REQUEST "Request"
 #define METHOD_RESPOND "Respond"

diff --git a/daemon/DbusServer.cpp b/daemon/DbusServer.cpp
index 2b18185..fbe3f6f 100755 (executable)
--- a/daemon/DbusServer.cpp
+++ b/daemon/DbusServer.cpp
@@ -243,7 +243,7 @@ void conv::DbusServer::publish(const char* dest, int reqId, const char* subject,
        _D("before g_dbusConnection_call..");
        GError *err = NULL;
        g_dbus_connection_call(dbusConnection, dest, DBUS_PATH, DBUS_IFACE,
-                       METHOD_RESPOND, param, NULL, G_DBUS_CALL_FLAGS_NONE, DBUS_TIMEOUT, NULL, NULL, &err);
+                       METHOD_RESPOND, param, NULL, G_DBUS_CALL_FLAGS_NONE, DBUS_TIMEOUT_CALL, NULL, NULL, &err);
 
        if (err != NULL) {
                _D("dbusConnection_call Error msg : %s", err->message);