Use MessageQueue for get_selection_text as well

Change-Id: Iae7836f950960ce2bf54ba89791119ef3bfcf059

diff --git a/ism/src/scim_helper.cpp b/ism/src/scim_helper.cpp
index 353177c..e92d188 100644 (file)
--- a/ism/src/scim_helper.cpp
+++ b/ism/src/scim_helper.cpp
@@ -2106,15 +2106,15 @@ HelperAgent::get_selection_text (String &text)
         m_impl->selection_text = NULL;
     }
 
-    for (int i = 0; i < 3; i++) {
-        filter_event ();
-        if (!m_impl->socket.is_connected ())
-            break;
+    const int WAIT_FOR_SYNC_RESPONSE_TIMEOUT = 1000;
+    /* Now we are waiting for the ISM_TRANS_CMD_UPDATE_SELECTION message */
+    if (wait_for_message(ISM_TRANS_CMD_UPDATE_SELECTION, WAIT_FOR_SYNC_RESPONSE_TIMEOUT)) {
+        MessageItem *message = message_queue.get_pending_message_by_cmd(ISM_TRANS_CMD_UPDATE_SELECTION);
+        handle_message(message);
+        message_queue.remove_message(message);
         if (m_impl->selection_text) {
             text = m_impl->selection_text;
-            break;
         }
-        //timeout
     }
 
     if (m_impl->selection_text) {