diff options
| author | Li Zhang <li2012.zhang@samsung.com> | 2016-05-19 14:07:53 +0800 |
|---|---|---|
| committer | Jihoon Kim <jihoon48.kim@samsung.com> | 2016-05-18 23:20:20 -0700 |
| commit | 96c0d3ca2b7d30fa2b0b61e61be03290e32a1cf2 (patch) | |
| tree | 151c09f02d52ecb92dcb5c2d940b542840ce69e5 /ism/src/scim_helper.cpp | |
| parent | cab6d9031f5e57661dc4c77b3221ac864f14f043 (diff) | |
| download | isf-96c0d3ca2b7d30fa2b0b61e61be03290e32a1cf2.tar.gz isf-96c0d3ca2b7d30fa2b0b61e61be03290e32a1cf2.tar.bz2 isf-96c0d3ca2b7d30fa2b0b61e61be03290e32a1cf2.zip | |
Fix issue: timeout was not initialized if registering helper failed
Change-Id: I94e374519a68f057d56dd969fc2efbedba30c0a1
Diffstat (limited to 'ism/src/scim_helper.cpp')
| -rw-r--r-- | ism/src/scim_helper.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ism/src/scim_helper.cpp b/ism/src/scim_helper.cpp index 914286c3..5a74a582 100644 --- a/ism/src/scim_helper.cpp +++ b/ism/src/scim_helper.cpp @@ -548,7 +548,7 @@ HelperAgent::open_connection (const HelperInfo &info, close_connection (); SocketAddress address (scim_get_default_panel_socket_address (display)); - int timeout = scim_get_default_socket_timeout (); + int timeout = m_impl->timeout = scim_get_default_socket_timeout (); uint32 magic; if (!address.valid ()) @@ -631,7 +631,6 @@ HelperAgent::open_connection (const HelperInfo &info, m_impl->recv.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY && m_impl->recv.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK) { m_impl->magic = magic; - m_impl->timeout = timeout; while (m_impl->recv.get_command (cmd)) { switch (cmd) { @@ -654,6 +653,9 @@ HelperAgent::open_connection (const HelperInfo &info, break; } } + } else { + //FIXME: Attaching input context is needed for desktop environment + LOGW ("Attach input context and update screen failed"); } ISF_SAVE_LOG ("Trying connect() with Helper_Active\n"); |