From 0cb279d38bde5731dcb2dfda4eed38d3963f86c3 Mon Sep 17 00:00:00 2001 From: Haifeng Deng Date: Fri, 1 Feb 2013 16:40:09 +0800 Subject: [PATCH] Call config->reload () in PanelAgent reload slot fucntion Change-Id: Ib9bcfc9965bb8f8cf1b346970a67de655b7557c7 --- ism/extras/efl_panel/isf_panel_efl.cpp | 5 ++--- ism/extras/efl_setting/isf_setting_efl.cpp | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp index 081045b..8fe94b2 100644 --- a/ism/extras/efl_panel/isf_panel_efl.cpp +++ b/ism/extras/efl_panel/isf_panel_efl.cpp @@ -1881,8 +1881,8 @@ static void slot_reload_config (void) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; - //if (!_config.null ()) - // _config->reload (); + if (!_config.null ()) + _config->reload (); } /** @@ -3125,7 +3125,6 @@ static void start_default_ise (void) SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; String default_uuid = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), _initial_ise_uuid); - String default_name = get_ise_name (default_uuid); if (!set_active_ise (default_uuid)) { std::cerr << __FUNCTION__ << " Failed to launch default ISE(" << default_uuid << ")\n"; diff --git a/ism/extras/efl_setting/isf_setting_efl.cpp b/ism/extras/efl_setting/isf_setting_efl.cpp index c815dda..ff725ed 100644 --- a/ism/extras/efl_setting/isf_setting_efl.cpp +++ b/ism/extras/efl_setting/isf_setting_efl.cpp @@ -328,7 +328,7 @@ static void show_language_cb (void *data, Evas_Object *obj, void *event_info) String langlist_str, normal_langlist_str; for (unsigned int i = 0; i < _names.size (); i++) { - if (strcmp (_names[i].c_str (), _sw_ise_list[index].c_str()) == 0) + if (strcmp (_names[i].c_str (), _sw_ise_list[index].c_str ()) == 0) langlist_str = _langs[i]; } std::vector langlist_vec,normal_langlist_vec; @@ -390,7 +390,6 @@ static void ise_option_view_set_cb (void *data, Evas_Object *obj, void *event_in struct ug_data *ugd = (struct ug_data *)data; ugd->key_end_cb = back_cb; _mdl->save_config (_config); - _config->reload (); helper_ise_reload_config (); } @@ -1261,7 +1260,6 @@ static void on_pause (ui_gadget_h ug, service_h s, void *priv) struct ug_data *ugd = (struct ug_data *) priv; if (ugd->key_end_cb == ise_option_view_set_cb) { //inside ise setup module _mdl->save_config (_config); - _config->reload (); helper_ise_reload_config (); elm_naviframe_item_pop_to (nf_main_it); @@ -1477,7 +1475,6 @@ extern "C" } } - _config->reload (); helper_ise_reload_config (); if (_imf_context != NULL) { -- 2.7.4