Remove a checker of error reason

Change-Id: Id54968fdd5c3a5a57f96e7a9c4fbdb1c665d4add
Signed-off-by: sooyeon <sooyeon.kim@samsung.com>

diff --git a/client/tts_core.c b/client/tts_core.c
index 7a4df9a..2d7d932 100644 (file)
--- a/client/tts_core.c
+++ b/client/tts_core.c
@@ -1129,7 +1129,6 @@ int tts_core_reprepare()
                        tts_client_s* client = iter->data;
                        if (false == tts_client_is_valid_client(client)) {
                                tts_client_set_current_state(client, TTS_STATE_CREATED);
-                               client->reason = TTS_ERROR_NONE;
                        }
 
                        iter = g_list_next(iter);

diff --git a/client/tts_dbus.c b/client/tts_dbus.c
index ea9058a..ac4655b 100644 (file)
--- a/client/tts_dbus.c
+++ b/client/tts_dbus.c
@@ -45,32 +45,31 @@ static int __tts_dbus_add_match(int uid)
                return TTS_ERROR_OPERATION_FAILED;
        }
 
-       if (TTS_ERROR_SERVICE_RESET != client->reason) {
-               tts_mode_e mode = tts_client_get_mode(client);
-               if (TTS_MODE_DEFAULT == 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 == 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 == 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);
-               } else if (TTS_MODE_INTERRUPT == mode) {
-                       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_INTERRUPT_SERVER_SERVICE_INTERFACE);
-               }
+       tts_mode_e mode = tts_client_get_mode(client);
+       if (TTS_MODE_DEFAULT == 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 == 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 == 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);
+       } else if (TTS_MODE_INTERRUPT == mode) {
+               snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_INTERRUPT_SERVER_SERVICE_INTERFACE);
+       }
 
-               /* initialize the error value */
-               DBusError err;
-               dbus_error_init(&err);
+       /* initialize the error value */
+       DBusError err;
+       dbus_error_init(&err);
 
-               dbus_bus_add_match(g_conn_listener, rule_err, &err);
-               dbus_connection_flush(g_conn_listener);
+       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
+       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
+
        return TTS_ERROR_NONE;
 }
 
@@ -608,27 +607,25 @@ int tts_dbus_request_initialize(int uid, bool* credential_needed)
                                return TTS_ERROR_OPERATION_FAILED;
                        }
 
-                       if (TTS_ERROR_SERVICE_RESET != client->reason) {
-                               tts_mode_e mode = tts_client_get_mode(client);
-                               if (TTS_MODE_DEFAULT == 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 == 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 == 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);
-                               } else if (TTS_MODE_INTERRUPT == mode) {
-                                       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_INTERRUPT_SERVER_SERVICE_INTERFACE);
-                               }
-                               dbus_bus_add_match(g_conn_listener, rule_err, &err);
-                               dbus_connection_flush(g_conn_listener);
+                       tts_mode_e mode = tts_client_get_mode(client);
+                       if (TTS_MODE_DEFAULT == 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 == 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 == 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);
+                       } else if (TTS_MODE_INTERRUPT == mode) {
+                               snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", TTS_INTERRUPT_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
+                       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);
                }