From edf9d242662c25155b696cd6ec326231c2b1c18c Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Fri, 10 Feb 2017 14:21:11 +0900 Subject: [PATCH] Remove running check in callback register function callback register function can be called before or after running Change-Id: I969ea9202a59850852945d27bffc4f5f2d94f6e9 Signed-off-by: Jihoon Kim --- src/inputmethod.cpp | 95 ----------------------------------------------------- 1 file changed, 95 deletions(-) diff --git a/src/inputmethod.cpp b/src/inputmethod.cpp index 9f44c18..3de158a 100644 --- a/src/inputmethod.cpp +++ b/src/inputmethod.cpp @@ -522,11 +522,6 @@ int ime_event_set_focus_in_cb(ime_focus_in_cb callback_func, void *user_data) return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -548,11 +543,6 @@ int ime_event_set_focus_out_cb(ime_focus_out_cb callback_func, void *user_data) return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -574,11 +564,6 @@ int ime_event_set_surrounding_text_updated_cb(ime_surrounding_text_updated_cb ca return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -600,11 +585,6 @@ int ime_event_set_input_context_reset_cb(ime_input_context_reset_cb callback_fun return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -626,11 +606,6 @@ int ime_event_set_cursor_position_updated_cb(ime_cursor_position_updated_cb call return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -652,11 +627,6 @@ int ime_event_set_language_requested_cb(ime_language_requested_cb callback_func, return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -678,11 +648,6 @@ int ime_event_set_language_set_cb(ime_language_set_cb callback_func, void *user_ return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -704,11 +669,6 @@ int ime_event_set_imdata_set_cb(ime_imdata_set_cb callback_func, void *user_data return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -730,11 +690,6 @@ int ime_event_set_imdata_requested_cb(ime_imdata_requested_cb callback_func, voi return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -756,11 +711,6 @@ int ime_event_set_layout_set_cb(ime_layout_set_cb callback_func, void *user_data return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -782,11 +732,6 @@ int ime_event_set_return_key_type_set_cb(ime_return_key_type_set_cb callback_fun return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -808,11 +753,6 @@ int ime_event_set_return_key_state_set_cb(ime_return_key_state_set_cb callback_f return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -834,11 +774,6 @@ int ime_event_set_geometry_requested_cb(ime_geometry_requested_cb callback_func, return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -860,11 +795,6 @@ int ime_event_set_process_key_event_cb(ime_process_key_event_cb callback_func, v return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -886,11 +816,6 @@ int ime_event_set_display_language_changed_cb(ime_display_language_changed_cb ca return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -912,11 +837,6 @@ int ime_event_set_rotation_degree_changed_cb(ime_rotation_degree_changed_cb call return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -938,11 +858,6 @@ int ime_event_set_accessibility_state_changed_cb(ime_accessibility_state_changed return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -964,11 +879,6 @@ int ime_event_set_option_window_created_cb(ime_option_window_created_cb callback return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); @@ -990,11 +900,6 @@ int ime_event_set_option_window_destroyed_cb(ime_option_window_destroyed_cb call return IME_ERROR_INVALID_PARAMETER; } - if (g_running) { - LOGW("IME_ERROR_OPERATION_FAILED"); - return IME_ERROR_OPERATION_FAILED; - } - retVal = _check_privilege(); if (retVal != IME_ERROR_NONE) { LOGE("_check_privilege returned %d.", retVal); -- 2.7.4