From 8e5df2f18cef91945ecad333b4403c9eab5224f6 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 21 Nov 2017 10:35:35 +0900 Subject: [PATCH] Change wrong conditional compile in writing IME DB Change-Id: Ie16db7d847305355d0fa4e13fe5f610b05edcd3e Signed-off-by: Jihoon Kim --- ism/extras/efl_panel/isf_panel_efl.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp index 0742b37..3593559 100644 --- a/ism/extras/efl_panel/isf_panel_efl.cpp +++ b/ism/extras/efl_panel/isf_panel_efl.cpp @@ -1910,11 +1910,11 @@ int get_ime_app_list_cb (const pkgmgrinfo_appinfo_h handle, void *user_data) ime_db.mode = TOOLBAR_HELPER_MODE; if (ime_db.pkgtype.compare ("rpm") == 0) //1 Inhouse Helper ISE(IME) { -#ifdef _TV - ime_db.options = SCIM_HELPER_STAND_ALONE | SCIM_HELPER_NEED_SCREEN_INFO | SCIM_HELPER_AUTO_RESTART | ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT; -#else - ime_db.options = SCIM_HELPER_STAND_ALONE | SCIM_HELPER_NEED_SCREEN_INFO | SCIM_HELPER_AUTO_RESTART; -#endif + if (_TV) + ime_db.options = SCIM_HELPER_STAND_ALONE | SCIM_HELPER_NEED_SCREEN_INFO | SCIM_HELPER_AUTO_RESTART | ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT; + else + ime_db.options = SCIM_HELPER_STAND_ALONE | SCIM_HELPER_NEED_SCREEN_INFO | SCIM_HELPER_AUTO_RESTART; + ime_db.module_name = ime_db.pkgid; String module_path = String (path) + String ("/lib"); @@ -1945,12 +1945,12 @@ int get_ime_app_list_cb (const pkgmgrinfo_appinfo_h handle, void *user_data) ime_db.is_preinstalled = 1; } else { -#ifdef _MOBILE - ime_db.is_enabled = 0; -#else - ime_db.is_enabled = 1; -#endif - ime_db.is_preinstalled = 0; + if (_MOBILE) + ime_db.is_enabled = 0; + else + ime_db.is_enabled = 1; + + ime_db.is_preinstalled = 0; } ime_db.has_option = -1; // At this point, we can't know IME has an option (setting) or not; -1 means unknown. } @@ -1968,11 +1968,11 @@ int get_ime_app_list_cb (const pkgmgrinfo_appinfo_h handle, void *user_data) ime_db.is_preinstalled = 1; } else { -#ifdef _MOBILE - ime_db.is_enabled = 0; -#else - ime_db.is_enabled = 1; -#endif + if (_MOBILE) + ime_db.is_enabled = 0; + else + ime_db.is_enabled = 1; + ime_db.is_preinstalled = 0; } ime_db.has_option = -1; // At this point, we can't know IME has an option (setting) or not; -1 means unknown. -- 2.7.4