Revert "Remove read command if its source is defunct"

This reverts commit 84b763a07232f4ac4a1ba289ebb7347ba921118f.

We do not have to use DEFUNCT signal.
in case of "NUI > Web > NUI", the reading of Web object is canceled by
tw_state_changed_cb > overwrite_last_read_command_with

Change-Id: I7f10cc389cdae1f594439749f34734da3bfba0bd

diff --git a/include/screen_reader.h b/include/screen_reader.h
index 7bb1ac8ce969ec78eb8850e7df51ac3f95151f1f..4650147fca30e5787658f1780ca48659d0a811b1 100644 (file)
--- a/include/screen_reader.h
+++ b/include/screen_reader.h
@@ -20,7 +20,6 @@
 #define TEXT_INSERT_SIG "object:text-changed:insert"
 #define TEXT_DELETE_SIG "object:text-changed:delete"
 #define STATE_CHECKED_SIG "object:state-changed:checked"
-#define STATE_DEFUNCT_SIG "object:state-changed:defunct"
 
 typedef enum {
        read_as_xml,

diff --git a/include/screen_reader_tts.h b/include/screen_reader_tts.h
index 8b4ca120603251b3a2bccd6139f712c57913534d..c774815c0b56d1a0cf9213df34bea73ebb20b8df 100644 (file)
--- a/include/screen_reader_tts.h
+++ b/include/screen_reader_tts.h
@@ -82,12 +82,6 @@ Read_Command *tw_speak(char *text_to_speak, Eina_Bool want_discard_previous_read
  */
 Read_Command *tw_speak_customized(char *text_to_speak, Eina_Bool want_discard_previous_reading, Eina_Bool discardable, AtspiAccessible *obj, unsigned int delay);
 
-/**
- * @brief Purges command from local queue or stops current reading for given object.
- * @param object an accessible do not want to read.
- */
-void tw_purge_object(AtspiAccessible *object);
-
 /**
  * @brief Purges commands from local queue and stops current reading.
  * If only_discardables is set to true, then only discardables are purged.

diff --git a/src/screen_reader_spi.c b/src/screen_reader_spi.c
index 50094b6c92403e7c19d4b6ebef4c7901692bc46a..c476b8804d2ee4934bd1cc0dfa0eb256be015a2a 100644 (file)
--- a/src/screen_reader_spi.c
+++ b/src/screen_reader_spi.c
@@ -277,6 +277,7 @@ void spi_event_get_text_to_read(
                        *text_to_read = g_strdup(_("COM_TV_SID_CHECKED"));
                else
                        *text_to_read = g_strdup(_("COM_TV_SID_UNCHECKED"));
+
        } else {
                ERROR("Unknown event type");
        }
@@ -320,13 +321,6 @@ static void spi_event_listener_cb(AtspiEvent *event, void *user_data)
        }
 
        DEBUG("Tracking signal - %s", spi->tracking_signal_name);
-
-       if (!g_strcmp0(event->type, STATE_DEFUNCT_SIG)) {
-               tw_purge_object(event->source);
-               DEBUG("END - defunct");
-               goto end;
-       }
-
        display_info(event);
 
        int cancel = 1;
@@ -445,7 +439,6 @@ SpiData *spi_init(void)
        spi_listener_register(spi->listener, TEXT_INSERT_SIG);
        spi_listener_register(spi->listener, TEXT_DELETE_SIG);
        spi_listener_register(spi->listener, STATE_CHECKED_SIG);
-       spi_listener_register(spi->listener, STATE_DEFUNCT_SIG);
 
        DEBUG("---------------------- SPI_init END ----------------------\n\n");
 
@@ -486,7 +479,6 @@ void spi_shutdown(SpiData *spi)
        spi_listener_deregister(spi->listener, VALUE_CHANGED_SIG);
        spi_listener_deregister(spi->listener, TEXT_INSERT_SIG);
        spi_listener_deregister(spi->listener, TEXT_DELETE_SIG);
-       spi_listener_deregister(spi->listener, STATE_DEFUNCT_SIG);
        g_object_unref(spi->listener);
        spi->listener = NULL;
 

diff --git a/src/screen_reader_tts.c b/src/screen_reader_tts.c
index a0a98905e9a752d2aeebf3b1c7373b3de9dbcf00..346fae4d7ee850923f16da675438d3d73607238d 100644 (file)
--- a/src/screen_reader_tts.c
+++ b/src/screen_reader_tts.c
@@ -300,25 +300,6 @@ static Read_Command *get_read_command_from_queue(TWData *tw, Eina_List **cmd_lis
        return result;
 }
 
-static Eina_Bool purge_object_from_command_queue(Eina_List **list_ptr, AtspiAccessible *object)
-{
-       Eina_Bool ret = EINA_FALSE;
-       Eina_List *l, *l_next, *list;
-       Read_Command *rc;
-
-       list = *list_ptr;
-       EINA_LIST_FOREACH_SAFE(list, l, l_next, rc) {
-               if (rc->obj == defunct_object) {
-                       list = eina_list_remove(list, rc);
-                       dispose_read_command(rc, READING_SKIPPED, READING_SKIPPED);
-                       ret = EINA_TRUE;
-               }
-       }
-       *list_ptr = list;
-
-       return ret;
-}
-
 static void purge_commands_from_queue(Eina_List **list_ptr, Eina_Bool only_discardables)
 {
        Eina_List *l, *l_next, *list;
@@ -981,19 +962,6 @@ void tw_shutdown(void)
        tw->init = 0;
 }
 
-void tw_purge_object(AtspiAccessible *object)
-{
-       DEBUG("BEGIN");
-       Eina_Bool purged = EINA_FALSE;
-       TWData *tw = tw_get_instance();
-       purged = purge_object_from_command_queue(&(tw->read_command_queue), object);
-       if (!purged && tw->last_read_command && tw->last_read_command->is_playing && tw->last_read_command->obj == object) {
-               stop_speaking(tw);
-               overwrite_last_read_command_with(tw, NULL);
-       }
-       DEBUG("END");
-}
-
 void tw_purge(Eina_Bool only_discardables)
 {
        DEBUG("BEGIN");