From f0efaf1f43396fd8359f390b25a8ce8784384ccd Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Thu, 28 Sep 2017 19:48:14 +0900 Subject: [PATCH] Revert "Relaunch IME if the connection is not properly made" Since the connection fail case is now handled using timer, ("Try re-launch IME if launch request failure is detected", commit 0b71ab13c936922fbb21d2025a2954197482ce36) it is not required to relaunch IME if it has been launched. This reverts commit 0555911cfa1c99ab17b41335b4bf3192527ad5a8. Change-Id: Ia550630e6d3df1a2b3ff7bc5a8ba8562dcee8638 --- ism/extras/efl_panel/isf_panel_efl.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp index 90ebd28..f92ef59 100644 --- a/ism/extras/efl_panel/isf_panel_efl.cpp +++ b/ism/extras/efl_panel/isf_panel_efl.cpp @@ -6367,9 +6367,10 @@ static void slot_get_ise_state (int &state) static void slot_start_default_ise (void) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; - String uuid = _config->read (SCIM_CONFIG_DEFAULT_HELPER_ISE, String ("")); if ((_info_manager->get_current_toolbar_mode () == TOOLBAR_HELPER_MODE)) { if (_launch_ise_on_request && !_soft_keyboard_launched) { + String uuid = _config->read (SCIM_CONFIG_DEFAULT_HELPER_ISE, String ("")); + LOGD ("Start helper (%s)\n", uuid.c_str ()); set_keyboard_engine (String (SCIM_COMPOSE_KEY_FACTORY_UUID)); @@ -6378,16 +6379,6 @@ static void slot_start_default_ise (void) else LOGW ("Failed to start helper (%s)\n", uuid.c_str ()); } - else if (_soft_keyboard_launched) /* In case IME is launched but can't show it because of the connection failure. */ - { - LOGD ("Restart helper (%s)\n", uuid.c_str ()); - - _info_manager->stop_helper (uuid); - if (_info_manager->start_helper (uuid)) - _soft_keyboard_launched = true; - else - _soft_keyboard_launched = false; - } } } -- 2.7.4