Prevent to add rule when tts service is reset

[platform/core/uifw/tts.git] / client / tts_dbus.c

diff --git a/client/tts_dbus.c b/client/tts_dbus.c
index 29248f8..e7dc689 100644 (file)
--- a/client/tts_dbus.c
+++ b/client/tts_dbus.c
@@ -158,12 +158,10 @@ static void __tts_dbus_connection_free()
 {
        if (NULL != g_conn_listener) {
                dbus_connection_close(g_conn_listener);
-               dbus_connection_unref(g_conn_listener);
                g_conn_listener = NULL;
        }
        if (NULL != g_conn_sender) {
                dbus_connection_close(g_conn_sender);
-               dbus_connection_unref(g_conn_sender);
                g_conn_sender = NULL;
        }
 }
@@ -425,20 +423,23 @@ int tts_dbus_request_initialize(int uid, bool* credential_needed)
                                return TTS_ERROR_OPERATION_FAILED;
                        }
 
-                       if (TTS_MODE_DEFAULT == client->mode) {
-                               snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_SERVER_SERVICE_INTERFACE);
-                       } else if (TTS_MODE_NOTIFICATION == client->mode) {
-                               snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_NOTI_SERVER_SERVICE_INTERFACE);
-                       } else if (TTS_MODE_SCREEN_READER == client->mode) {
-                               snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_SR_SERVER_SERVICE_INTERFACE);
-                       }
-                       dbus_bus_add_match(g_conn_listener, rule_err, &err);
-                       dbus_connection_flush(g_conn_listener);
-
-                       if (dbus_error_is_set(&err)) {
-                               SLOG(LOG_ERROR, TAG_TTSC, "Match Error (%s)", err.message);
-                               dbus_error_free(&err);
-                               return TTS_ERROR_OPERATION_FAILED;
+                       if (TTS_ERROR_SERVICE_RESET != client->reason) {
+                               if (TTS_MODE_DEFAULT == client->mode) {
+                                       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_SERVER_SERVICE_INTERFACE);
+                               } else if (TTS_MODE_NOTIFICATION == client->mode) {
+                                       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_NOTI_SERVER_SERVICE_INTERFACE);
+                               } else if (TTS_MODE_SCREEN_READER == client->mode) {
+                                       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_SR_SERVER_SERVICE_INTERFACE);
+                               }
+                               dbus_bus_add_match(g_conn_listener, rule_err, &err);
+                               dbus_connection_flush(g_conn_listener);
+
+                               if (dbus_error_is_set(&err)) {
+                                       SLOG(LOG_ERROR, TAG_TTSC, "Match Error (%s)", err.message);
+                                       dbus_error_free(&err);
+                                       return TTS_ERROR_OPERATION_FAILED;
+                               }
+                               client->reason = 0; // default value
                        }
                } else {
                        SLOG(LOG_ERROR, TAG_TTSC, "<<<< tts initialize : result = %d", result);