diff --git a/scim-wnn/src/scim_wnn_def.h b/scim-wnn/src/scim_wnn_def.h index 45e9ea2..265017c 100644 --- a/scim-wnn/src/scim_wnn_def.h +++ b/scim-wnn/src/scim_wnn_def.h @@ -65,5 +65,8 @@ #define SCIM_CONFIG_WNN_RC "/IMEngine/Wnn/Rc" #define SCIM_DEFAULT_WNN_RC "/usr/lib/wnn7/ja_JP/wnnenvrc" +#define SCIM_CONFIG_WNN_MINISTATUS "/IMEngine/Wnn/MiniStatus" +#define SCIM_DEFAULT_WNN_MINISTATUS true + #endif diff --git a/scim-wnn/src/scim_wnn_imengine.cpp b/scim-wnn/src/scim_wnn_imengine.cpp index da97de9..1c03950 100644 --- a/scim-wnn/src/scim_wnn_imengine.cpp +++ b/scim-wnn/src/scim_wnn_imengine.cpp @@ -185,7 +185,9 @@ WnnInstance::~ WnnInstance() { - delete m_preeditor; + for(unsigned int i = 0;i < preeditors.size();i ++) { + delete(preeditors.at(i)); + } } @@ -196,13 +198,14 @@ { m_conversion = false; m_lookup = false; - mini_status = true; // @todo should read from a config. // @todo if connected to jserver, should disconnect this. host = _scim_config->read(String(SCIM_CONFIG_WNN_SERVER),String(SCIM_DEFAULT_WNN_SERVER)); rc = _scim_config->read(String(SCIM_CONFIG_WNN_RC),String(SCIM_DEFAULT_WNN_RC)); alp = _scim_config->read(String(SCIM_CONFIG_WNN_ALP),SCIM_DEFAULT_WNN_ALP); + mini_status = _scim_config->read(String(SCIM_CONFIG_WNN_MINISTATUS),SCIM_DEFAULT_WNN_MINISTATUS); + // �ǥե���ȥ������ꡣ scim_string_to_key_list(k_conversion_start,