From: Sungmin Kwak Date: Wed, 22 Nov 2017 02:04:45 +0000 (+0900) Subject: Remote unnecessary newline characters in log X-Git-Tag: accepted/tizen/unified/20171130.063228~4 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=772c70ac5c07e876490fc26d4c26f5c34fd55cb2;p=platform%2Fcore%2Fuifw%2Fisf.git Remote unnecessary newline characters in log Change-Id: Ibdb9e3435c7ecc5b6ee68269920636254adc7ce7 (cherry picked from commit 82bebf254cf1755a8601e3d820fa31f9f6d83b98) --- diff --git a/ism/demos/isf_demo_efl.cpp b/ism/demos/isf_demo_efl.cpp index 4c4f426..da18a12 100644 --- a/ism/demos/isf_demo_efl.cpp +++ b/ism/demos/isf_demo_efl.cpp @@ -171,7 +171,7 @@ static int create_demo_view (struct appdata *ad) if (!l_button) return -1; if (!elm_object_style_set (l_button, "naviframe/end_btn/default")) - LOGW ("Failed to set style of button\n"); + LOGW ("Failed to set style of button"); evas_object_smart_callback_add (l_button, "clicked", _quit_cb, NULL); @@ -216,7 +216,7 @@ static Evas_Object* create_win (const char *name) win_del, NULL); elm_win_screen_size_get (eo, NULL, NULL, &w, &h); - LOGD ("resize window as %d x %d\n", w, h); + LOGD ("resize window as %d x %d", w, h); evas_object_resize (eo, w, h); } @@ -233,7 +233,7 @@ _vkbd_state_on (void *data, Evas_Object *obj, void *event_info) struct appdata *ad = (struct appdata *)data; if (ad == NULL) return; - LOGD ("input panel is shown\n"); + LOGD ("input panel is shown"); ad->vkbd_state = EINA_TRUE; } @@ -243,7 +243,7 @@ _vkbd_state_off (void *data, Evas_Object *obj, void *event_info) struct appdata *ad = (struct appdata *)data; if (ad == NULL) return; - LOGD ("input panel is hidden\n"); + LOGD ("input panel is hidden"); ad->vkbd_state = EINA_FALSE; } @@ -315,7 +315,7 @@ static Eina_Bool _keydown_event (void *data, int type, void *event) struct appdata *ad = (struct appdata *)data; if (ad == NULL || ev == NULL) return ECORE_CALLBACK_PASS_ON; - LOGD ("[ecore key down] keyname : '%s', key : '%s', string : '%s', compose : '%s'\n", ev->keyname, ev->key, ev->string, ev->compose); + LOGD ("[ecore key down] keyname : '%s', key : '%s', string : '%s', compose : '%s'", ev->keyname, ev->key, ev->string, ev->compose); return ECORE_CALLBACK_PASS_ON; } @@ -325,7 +325,7 @@ static Eina_Bool _keyup_event (void *data, int type, void *event) Ecore_Event_Key *ev = (Ecore_Event_Key *)event; if (ev == NULL) return ECORE_CALLBACK_PASS_ON; - LOGD ("[ecore key up] keyname : '%s', key : '%s', string : '%s', compose : '%s'\n", ev->keyname, ev->key, ev->string, ev->compose); + LOGD ("[ecore key up] keyname : '%s', key : '%s', string : '%s', compose : '%s'", ev->keyname, ev->key, ev->string, ev->compose); if (strcmp (ev->keyname, "XF86Send") == 0 || strcmp (ev->keyname, "XF86Menu") == 0) { @@ -343,19 +343,19 @@ static void input_panel_state_changed_cb (keynode_t *key, void* data) switch (sip_status) { case VCONFKEY_ISF_INPUT_PANEL_STATE_HIDE: - LOGD ("state : hide\n"); + LOGD ("state : hide"); break; case VCONFKEY_ISF_INPUT_PANEL_STATE_WILL_HIDE: - LOGD ("state : will_hide\n"); + LOGD ("state : will_hide"); break; case VCONFKEY_ISF_INPUT_PANEL_STATE_SHOW: - LOGD ("state : show\n"); + LOGD ("state : show"); break; case VCONFKEY_ISF_INPUT_PANEL_STATE_WILL_SHOW: - LOGD ("state : will_show\n"); + LOGD ("state : will_show"); break; default : - LOGD ("sip_status error!\n"); + LOGD ("sip_status error!"); break; } } @@ -367,7 +367,7 @@ static int app_create (void *data) ad->win_main = create_win ("isf-demo-efl"); if (!ad->win_main) { - LOGE ("Failed to create window\n"); + LOGE ("Failed to create window"); return -1; } @@ -538,7 +538,7 @@ Evas_Object *create_naviframe_back_button (struct appdata *ad) { Evas_Object *back_btn = elm_button_add (ad->naviframe); if (!elm_object_style_set (back_btn, "naviframe/end_btn/default")) - LOGW ("Failed to set style of button\n"); + LOGW ("Failed to set style of button"); evas_object_smart_callback_add (back_btn, "clicked", _back_btn_clicked_cb, ad); @@ -592,7 +592,7 @@ int autotest_demo_test_func(void *param) { autotest_demo_param *demo_param = (autotest_demo_param*)param; if (demo_param) { - isf_demo_autotest_log("Executing Demo item : %s\n", demo_param->name.c_str()); + isf_demo_autotest_log("Executing Demo item : %s", demo_param->name.c_str()); switch (demo_param->cmd) { case autotest_demo_cmd_open: isf_demo_menu_its[demo_param->index].func(demo_param->ad, NULL, NULL); diff --git a/ism/demos/isf_entry_event_efl.cpp b/ism/demos/isf_entry_event_efl.cpp index 9621d33..974e150 100644 --- a/ism/demos/isf_entry_event_efl.cpp +++ b/ism/demos/isf_entry_event_efl.cpp @@ -34,9 +34,9 @@ static Evas_Object * _commit_event_label = NULL; static void _input_panel_event_callback (void *data, Ecore_IMF_Context *ctx, int value) { if (value == ECORE_IMF_INPUT_PANEL_STATE_SHOW) { - LOGD ("ECORE_IMF_INPUT_PANEL_STATE_SHOW\n"); + LOGD ("ECORE_IMF_INPUT_PANEL_STATE_SHOW"); } else if (value == ECORE_IMF_INPUT_PANEL_STATE_HIDE) { - LOGD ("ECORE_IMF_INPUT_PANEL_STATE_HIDE\n"); + LOGD ("ECORE_IMF_INPUT_PANEL_STATE_HIDE"); } } diff --git a/ism/demos/isf_event_efl.cpp b/ism/demos/isf_event_efl.cpp index 564b0f5..a3108f0 100644 --- a/ism/demos/isf_event_efl.cpp +++ b/ism/demos/isf_event_efl.cpp @@ -149,7 +149,7 @@ static void isf_label_event_demo_bt (void *data, Evas_Object *obj, void *event_i const char *ctx_id = ecore_imf_context_default_id_get (); if (!ctx_id) { - LOGW ("Cannot create imf context\n"); + LOGW ("Cannot create imf context"); return; } diff --git a/ism/demos/isf_imcontrol_efl.cpp b/ism/demos/isf_imcontrol_efl.cpp index 0c1c7b0..1c49df6 100644 --- a/ism/demos/isf_imcontrol_efl.cpp +++ b/ism/demos/isf_imcontrol_efl.cpp @@ -88,7 +88,7 @@ static void test_input_panel_geometry_get (void *data, Evas_Object *obj, void *e int x, y, w, h; if (imf_context != NULL) { ecore_imf_context_input_panel_geometry_get (imf_context, &x, &y, &w, &h); - LOGD ("x : %d, y : %d, w : %d, h : %d\n", x, y, w, h); + LOGD ("x : %d, y : %d, w : %d, h : %d", x, y, w, h); } } @@ -123,7 +123,7 @@ static void test_input_panel_imdata_get (void *data, Evas_Object *obj, void *eve if (buf != NULL) { if (imf_context != NULL) { ecore_imf_context_input_panel_imdata_get (imf_context, buf, &len); - LOGD ("get imdata %s, and len is %d ...\n", (char *)buf, len); + LOGD ("get imdata %s, and len is %d", (char *)buf, len); } free (buf); } @@ -141,7 +141,7 @@ static void test_input_panel_layout_get (void *data, Evas_Object *obj, void *eve Ecore_IMF_Input_Panel_Layout layout; if (imf_context != NULL) { layout = ecore_imf_context_input_panel_layout_get (imf_context); - LOGD ("get layout : %d ...\n", (int)layout); + LOGD ("get layout : %d", (int)layout); } } @@ -151,7 +151,7 @@ static void test_input_panel_state_get (void *data, Evas_Object *obj, void *even if (imf_context != NULL) { state = ecore_imf_context_input_panel_state_get (imf_context); - LOGD ("ise state : %d \n", (int)state); + LOGD ("ise state : %d", (int)state); } } @@ -161,7 +161,7 @@ static void test_input_panel_language_locale_get (void *data, Evas_Object *obj, if (imf_context != NULL) { ecore_imf_context_input_panel_language_locale_get (imf_context, &locale); - LOGD ("locale : %s\n", locale); + LOGD ("locale : \"%s\"", locale); } if (locale) @@ -173,7 +173,7 @@ static void test_get_active_ise (void *data, Evas_Object *obj, void *event_info) char *uuid = NULL; int ret = isf_control_get_active_ise (&uuid); if (ret > 0 && uuid) - LOGD ("Get active ISE: %s\n", uuid); + LOGD ("Get active ISE: \"%s\"", uuid); if (uuid) free (uuid); } @@ -182,15 +182,15 @@ static void test_get_ise_list (void *data, Evas_Object *obj, void *event_info) { char **iselist = NULL; int count = isf_control_get_ise_list (&iselist); - LOGD ("Count : %d\n", count); + LOGD ("Count : %d", count); for (int i = 0; i < count; i++) { if (iselist[i]) { - LOGD ("[%d : %s]\n", i, iselist[i]); + LOGD ("[%d : %s]", i, iselist[i]); free (iselist[i]); } else { - LOGD ("[%d] No data\n", i); + LOGD ("[%d] No data", i); } } if (iselist) @@ -208,7 +208,7 @@ static void test_get_ise_info (void *data, Evas_Object *obj, void *event_info) int option = 0; ret = isf_control_get_ise_info (uuid, &name, &language, &type, &option); if (ret == 0 && name && language) { - LOGD ("Active ISE: uuid[%s], name[%s], language[%s], type[%d], option[%d]\n", uuid, name, language, type, option); + LOGD ("Active ISE: uuid[%s], name[%s], language[%s], type[%d], option[%d]", uuid, name, language, type, option); } if (name) free (name); @@ -221,43 +221,43 @@ static void test_get_ise_info (void *data, Evas_Object *obj, void *event_info) static void test_get_ise_count (void *data, Evas_Object *obj, void *event_info) { - LOGD ("S/W keyboard : %d, H/W keyboard : %d\n", isf_control_get_ise_count (SOFTWARE_KEYBOARD_ISE), isf_control_get_ise_count (HARDWARE_KEYBOARD_ISE)); + LOGD ("S/W keyboard : %d, H/W keyboard : %d", isf_control_get_ise_count (SOFTWARE_KEYBOARD_ISE), isf_control_get_ise_count (HARDWARE_KEYBOARD_ISE)); } static void test_reset_default_ise (void *data, Evas_Object *obj, void *event_info) { int ret = isf_control_set_active_ise_to_default (); if (ret == 0) - LOGD ("Reset default ISE is successful!\n"); + LOGD ("Reset default ISE is successful!"); else - LOGW ("Reset default ISE is failed!!!\n"); + LOGW ("Reset default ISE is failed!!!"); } static void test_show_ime_list (void *data, Evas_Object *obj, void *event_info) { int ret = isf_control_show_ime_list (); if (ret == 0) - LOGD ("Show IME list is successful!\n"); + LOGD ("Show IME list is successful!"); else - LOGW ("Show IME list is failed!!!\n"); + LOGW ("Show IME list is failed!!!"); } static void test_show_ise_selector (void *data, Evas_Object *obj, void *event_info) { int ret = isf_control_show_ise_selector (); if (ret == 0) - LOGD ("Show ISE selector is successful!\n"); + LOGD ("Show ISE selector is successful!"); else - LOGW ("Show ISE selector is failed!!!\n"); + LOGW ("Show ISE selector is failed!!!"); } static void test_show_ise_option (void *data, Evas_Object *obj, void *event_info) { int ret = isf_control_show_ise_option_window (); if (ret == 0) - LOGD ("Show ISE option window is successful!\n"); + LOGD ("Show ISE option window is successful!"); else - LOGW ("Show ISE option window is failed!!!\n"); + LOGW ("Show ISE option window is failed!!!"); } static void test_is_ime_enabled (void *data, Evas_Object *obj, void *event_info) @@ -266,18 +266,18 @@ static void test_is_ime_enabled (void *data, Evas_Object *obj, void *event_info) bool enabled; int ret = isf_control_get_initial_ise (&uuid); if (ret > 0 && uuid) { - LOGD ("Get initial ISE: %s\n", uuid); + LOGD ("Get initial ISE: %s", uuid); int ret = isf_control_is_ime_enabled (uuid, &enabled); if (ret == 0) { - LOGD ("is_ime_enabled is successful! enabled : %d\n", enabled); + LOGD ("is_ime_enabled is successful! enabled : %d", enabled); } else { - LOGW ("is_ime_enabled is failed!\n"); + LOGW ("is_ime_enabled is failed!"); } } else - LOGW ("Failed to get initial ISE\n"); + LOGW ("Failed to get initial ISE"); if (uuid) free (uuid); @@ -288,9 +288,9 @@ static void test_get_initial_ise (void *data, Evas_Object *obj, void *event_info char *uuid = NULL; int ret = isf_control_get_initial_ise (&uuid); if (ret > 0 && uuid) - LOGD ("Get initial ISE: %s\n", uuid); + LOGD ("Get initial ISE: %s", uuid); else - LOGW ("Failed to get initial ISE\n"); + LOGW ("Failed to get initial ISE"); if (uuid) free (uuid); @@ -300,19 +300,19 @@ static void test_get_recent_ise_geometry_get (void *data, Evas_Object *obj, void { int x, y, w, h; if (isf_control_get_recent_ime_geometry (&x, &y, &w, &h) == 0) { - LOGD ("x : %d, y : %d, width : %d, height : %d\n", x, y, w, h); + LOGD ("x : %d, y : %d, width : %d, height : %d", x, y, w, h); } else { - LOGW ("Failed to get recent ime geometry\n"); + LOGW ("Failed to get recent ime geometry"); } int angle = elm_win_rotation_get (win); if (isf_control_get_recent_ime_geometry_with_rotation_angle (angle, &x, &y, &w, &h) == 0) { - LOGD ("angle : %d, x : %d, y : %d, width : %d, height : %d\n", angle, x, y, w, h); + LOGD ("angle : %d, x : %d, y : %d, width : %d, height : %d", angle, x, y, w, h); } else { - LOGW ("Failed to get recent ime geometry with rotation angle\n"); + LOGW ("Failed to get recent ime geometry with rotation angle"); } } @@ -322,7 +322,7 @@ static void test_input_panel_keyboard_mode_get (void *data, Evas_Object *obj, vo if (imf_context != NULL) { mode = ecore_imf_context_keyboard_mode_get (imf_context); - LOGD ("get keyboard mode : %d\n", (int)mode); + LOGD ("get keyboard mode : %d", (int)mode); } } @@ -387,20 +387,20 @@ win_rotation_changed_cb (void *data, Evas_Object *obj, void *event_info) int angle = elm_win_rotation_get (ad->win_main); - LOGD ("rotate. angle : %d\n", angle); + LOGD ("rotate. angle : %d", angle); if (isf_control_get_recent_ime_geometry (&x, &y, &w, &h) == 0) { - LOGD ("x : %d, y : %d, width : %d, height : %d\n", x, y, w, h); + LOGD ("x : %d, y : %d, width : %d, height : %d", x, y, w, h); } else { - LOGW ("Failed to get recent ime geometry\n"); + LOGW ("Failed to get recent ime geometry"); } if (isf_control_get_recent_ime_geometry_with_rotation_angle (angle, &x, &y, &w, &h) == 0) { - LOGD ("angle : %d, x : %d, y : %d, width : %d, height : %d\n", angle, x, y, w, h); + LOGD ("angle : %d, x : %d, y : %d, width : %d, height : %d", angle, x, y, w, h); } else { - LOGW ("Failed to get recent ime geometry with rotation angle\n"); + LOGW ("Failed to get recent ime geometry with rotation angle"); } } @@ -412,7 +412,7 @@ void imcontrolapi_bt (void *data, Evas_Object *obj, void *event_info) if (ctx_id != NULL) { imf_context = ecore_imf_context_add (ctx_id); } else { - LOGW ("Cannot create imf context\n"); + LOGW ("Cannot create imf context"); ecore_imf_shutdown (); return; } diff --git a/ism/demos/isf_layout_efl.cpp b/ism/demos/isf_layout_efl.cpp index 0905e16..9d94dee 100644 --- a/ism/demos/isf_layout_efl.cpp +++ b/ism/demos/isf_layout_efl.cpp @@ -95,12 +95,12 @@ static void _input_panel_state_cb (void *data, Ecore_IMF_Context *ctx, int value if (value == ECORE_IMF_INPUT_PANEL_STATE_SHOW) { ecore_imf_context_input_panel_geometry_get (ctx, &x, &y, &w, &h); - LOGD ("Input panel is shown. ctx : %p\n", ctx); - LOGD ("x : %d, y : %d, w : %d, h : %d\n", x, y, w, h); + LOGD ("Input panel is shown. ctx : %p", ctx); + LOGD ("x : %d, y : %d, w : %d, h : %d", x, y, w, h); } else if (value == ECORE_IMF_INPUT_PANEL_STATE_HIDE) { - LOGD ("Input panel is hidden. ctx : %p\n", ctx); + LOGD ("Input panel is hidden. ctx : %p", ctx); } else if (value == ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW) { - LOGD ("Input panel will be shown. ctx : %p\n", ctx); + LOGD ("Input panel will be shown. ctx : %p", ctx); } } @@ -109,15 +109,15 @@ static void _input_panel_resize_cb (void *data, Ecore_IMF_Context *ctx, int valu int x, y, w, h; ecore_imf_context_input_panel_geometry_get (ctx, &x, &y, &w, &h); - LOGD ("x : %d, y : %d, w : %d, h : %d\n", x, y, w, h); + LOGD ("x : %d, y : %d, w : %d, h : %d", x, y, w, h); } static void _shift_mode_cb (void *data, Ecore_IMF_Context *ctx, int value) { if (value == ECORE_IMF_INPUT_PANEL_SHIFT_MODE_OFF) { - LOGD ("Shift Mode : OFF\n"); + LOGD ("Shift Mode : OFF"); } else if (value == ECORE_IMF_INPUT_PANEL_SHIFT_MODE_ON) { - LOGD ("Shift Mode : ON\n"); + LOGD ("Shift Mode : ON"); } } @@ -127,7 +127,7 @@ static void _language_changed_cb (void *data, Ecore_IMF_Context *ctx, int value) ecore_imf_context_input_panel_language_locale_get (ctx, &locale); - LOGD ("language : %s\n", locale); + LOGD ("language : %s", locale); if (locale) free (locale); @@ -139,10 +139,10 @@ static void _candidate_panel_state_cb (void *data, Ecore_IMF_Context *ctx, int v if (value == ECORE_IMF_CANDIDATE_PANEL_SHOW) { ecore_imf_context_candidate_panel_geometry_get (ctx, &x, &y, &w, &h); - LOGD ("Candidate window is shown\n"); - LOGD ("x : %d, y : %d, w : %d, h : %d\n", x, y, w, h); + LOGD ("Candidate window is shown"); + LOGD ("x : %d, y : %d, w : %d, h : %d", x, y, w, h); } else if (value == ECORE_IMF_CANDIDATE_PANEL_HIDE) { - LOGD ("Candidate window is hidden\n"); + LOGD ("Candidate window is hidden"); } } @@ -151,23 +151,23 @@ static void _candidate_panel_geometry_changed_cb (void *data, Ecore_IMF_Context int x, y, w, h; ecore_imf_context_candidate_panel_geometry_get (ctx, &x, &y, &w, &h); - LOGD ("ctx : %p, x : %d, y : %d, w : %d, h : %d\n", ctx, x, y, w, h); + LOGD ("ctx : %p, x : %d, y : %d, w : %d, h : %d", ctx, x, y, w, h); } static void _key_down_cb (void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Event_Key_Down *ev = (Evas_Event_Key_Down *)event_info; - LOGD ("[evas key down] keyname : '%s', key : '%s', string : '%s', compose : '%s'\n", ev->keyname, ev->key, ev->string, ev->compose); - LOGD ("[evas key down] capslock : %d, num lock : %d\n", evas_key_lock_is_set(ev->locks, "Caps_Lock"), evas_key_lock_is_set(ev->locks, "Num_Lock")); + LOGD ("[evas key down] keyname : '%s', key : '%s', string : '%s', compose : '%s'", ev->keyname, ev->key, ev->string, ev->compose); + LOGD ("[evas key down] capslock : %d, num lock : %d", evas_key_lock_is_set(ev->locks, "Caps_Lock"), evas_key_lock_is_set(ev->locks, "Num_Lock")); } static void _key_up_cb (void *data, Evas *e, Evas_Object *obj, void *event_info) { Evas_Event_Key_Up *ev = (Evas_Event_Key_Up *)event_info; - LOGD ("[evas key up] keyname : '%s', key : '%s', string : '%s', compose : '%s'\n", ev->keyname, ev->key, ev->string, ev->compose); - LOGD ("[evas key up] capslock : %d, num lock : %d\n", evas_key_lock_is_set(ev->locks, "Caps_Lock"), evas_key_lock_is_set(ev->locks, "Num_Lock")); + LOGD ("[evas key up] keyname : '%s', key : '%s', string : '%s', compose : '%s'", ev->keyname, ev->key, ev->string, ev->compose); + LOGD ("[evas key up] capslock : %d, num lock : %d", evas_key_lock_is_set(ev->locks, "Caps_Lock"), evas_key_lock_is_set(ev->locks, "Num_Lock")); } #ifndef WAYLAND @@ -182,7 +182,7 @@ _print_keyboard_geometry (Ecore_X_Window xwin) if (!ecore_x_e_illume_keyboard_geometry_get (zone, &sx, &sy, &sw, &sh)) sx = sy = sw = sh = 0; - LOGD ("Keyboard geometry x : %d, y : %d, w : %d, h : %d\n", sx, sy, sw, sh); + LOGD ("Keyboard geometry x : %d, y : %d, w : %d, h : %d", sx, sy, sw, sh); } static Eina_Bool @@ -206,17 +206,17 @@ _prop_change_cb (void *data, int type, void *event) static void entry_changed_cb (void *data, Evas_Object *obj, void *event_info) { - LOGD ("The text within the entry was changed.\n"); + LOGD ("The text within the entry was changed."); } static void entry_preedit_changed_cb (void *data, Evas_Object *obj, void *event_info) { - LOGD ("The preedit string has changed.\n"); + LOGD ("The preedit string has changed."); } static void entry_cursor_changed_cb (void *data, Evas_Object *obj, void *event_info) { - LOGD ("cursor pos : %d\n", elm_entry_cursor_pos_get (obj)); + LOGD ("cursor pos : %d", elm_entry_cursor_pos_get (obj)); } static void _commit_content_cb (void *data, Ecore_IMF_Context *ctx, void *event) @@ -224,7 +224,7 @@ static void _commit_content_cb (void *data, Ecore_IMF_Context *ctx, void *event) Ecore_IMF_Event_Commit_Content *commit_content = (Ecore_IMF_Event_Commit_Content *)event; if (!commit_content) return; - LOGD ("content : %s, description : %s, mime types : %s\n", commit_content->content_uri, commit_content->description, commit_content->mime_types); + LOGD ("content : %s, description : %s, mime types : %s", commit_content->content_uri, commit_content->description, commit_content->mime_types); } static Evas_Object *_create_ef_layout (Evas_Object *parent, const char *label, const char *guide_text, Elm_Input_Panel_Layout layout, int layout_variation = 0) diff --git a/ism/extras/efl_immodule/isf_imf_context.cpp b/ism/extras/efl_immodule/isf_imf_context.cpp index 81991df..e594a40 100644 --- a/ism/extras/efl_immodule/isf_imf_context.cpp +++ b/ism/extras/efl_immodule/isf_imf_context.cpp @@ -464,11 +464,11 @@ _key_down_cb (void *data, int type, void *event) if (ecore_imf_context_input_panel_state_get (active_ctx) == ECORE_IMF_INPUT_PANEL_STATE_HIDE) return EINA_TRUE; } - LOGD ("%s key is pressed.\n", ev->keyname); + LOGD ("%s key is pressed.", ev->keyname); if (_active_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) { KeyEvent key; scim_string_to_key (key, ev->key); - LOGD ("process hide_ise_key_event to handle it in the helper: %s\n", ev->keyname); + LOGD ("process hide_ise_key_event to handle it in the helper: %s", ev->keyname); void *pvoid = &ret; _panel_client.prepare (ic->id); _panel_client.process_key_event (key, (int*) pvoid); @@ -511,13 +511,13 @@ _key_up_cb (void *data, int type, void *event) if (ecore_imf_context_input_panel_state_get (active_ctx) == ECORE_IMF_INPUT_PANEL_STATE_HIDE) return EINA_TRUE; } - LOGD ("%s key is released.\n", ev->keyname); + LOGD ("%s key is released.", ev->keyname); if (_active_helper_option & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT) { KeyEvent key; scim_string_to_key (key, ev->key); key.mask = SCIM_KEY_ReleaseMask; key.mask &= _valid_key_mask; - LOGD ("process hide_ise_key_event to handle it in the helper: %s\n", ev->keyname); + LOGD ("process hide_ise_key_event to handle it in the helper: %s", ev->keyname); void *pvoid = &ret; _panel_client.prepare (ic->id); _panel_client.process_key_event (key, (int*) pvoid); @@ -554,7 +554,7 @@ _key_up_cb (void *data, int type, void *event) } _click_timer = ecore_timer_add (0.4, _click_check, NULL); } else { - LOGD ("Skip toggle key input\n"); + LOGD ("Skip toggle key input"); ecore_timer_del (_click_timer); _click_timer = ecore_timer_add (0.4, _click_check, NULL); } @@ -1059,7 +1059,7 @@ _scim_finalize (void) if (_scim_initialized) { _scim_initialized = false; - LOGD ("immodule shutdown\n"); + LOGD ("immodule shutdown"); vconf_ignore_key_changed (VCONFKEY_AUTOPERIOD_ALLOW_BOOL, autoperiod_allow_changed_cb); vconf_ignore_key_changed (VCONFKEY_AUTOCAPITAL_ALLOW_BOOL, autocapital_allow_changed_cb); @@ -1158,7 +1158,7 @@ isf_imf_context_add (Ecore_IMF_Context *ctx) if (_config) context_scim->impl->is_on = _config->read (String (SCIM_CONFIG_FRONTEND_IM_OPENED_BY_DEFAULT), context_scim->impl->is_on); else - LOGW ("Failed to read in config\n"); + LOGW ("Failed to read in config"); SCIM_DEBUG_FRONTEND(2) << "input context created: id = " << context_scim->id << "\n"; } @@ -1193,7 +1193,7 @@ isf_imf_context_del (Ecore_IMF_Context *ctx) _panel_client.prepare (context_scim->id); if (input_panel_ctx == ctx && _scim_initialized) { - LOGD ("ctx : %p\n", ctx); + LOGD ("ctx : %p", ctx); Ecore_IMF_Input_Panel_State l_input_panel_state = ecore_imf_context_input_panel_state_get (ctx); if (l_input_panel_state == ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW || l_input_panel_state == ECORE_IMF_INPUT_PANEL_STATE_SHOW) { @@ -1351,7 +1351,7 @@ isf_imf_context_focus_in (Ecore_IMF_Context *ctx) //if h/w keyboard mode, keyboard mode will be changed to s/w mode when the entry get the focus. if (kbd_mode == TOOLBAR_KEYBOARD_MODE) { - LOGD ("Keyboard mode is changed H/W->S/W because of focus_in.\n"); + LOGD ("Keyboard mode is changed H/W->S/W because of focus_in."); isf_imf_context_set_keyboard_mode (ctx, TOOLBAR_HELPER_MODE); } } @@ -1391,16 +1391,16 @@ isf_imf_context_focus_in (Ecore_IMF_Context *ctx) context_scim->impl->shift_mode_enabled = 0; } - LOGD ("ctx : %p. on demand : %d\n", ctx, ecore_imf_context_input_panel_show_on_demand_get (ctx)); + LOGD ("ctx : %p. on demand : %d", ctx, ecore_imf_context_input_panel_show_on_demand_get (ctx)); if (ecore_imf_context_input_panel_enabled_get (ctx)) { if (!ecore_imf_context_input_panel_show_on_demand_get (ctx)) ecore_imf_context_input_panel_show (ctx); else - LOGD ("ctx : %p input panel on demand mode : TRUE\n", ctx); + LOGD ("ctx : %p input panel on demand mode : TRUE", ctx); } else - LOGD ("ctx : %p input panel enable : FALSE\n", ctx); + LOGD ("ctx : %p input panel enable : FALSE", ctx); if (get_keyboard_mode () == TOOLBAR_KEYBOARD_MODE) clear_hide_request (); @@ -1426,7 +1426,7 @@ isf_imf_context_focus_out (Ecore_IMF_Context *ctx) if (context_scim && context_scim->impl && context_scim == _focused_ic) { WideString wstr = context_scim->impl->preedit_string; - LOGD ("ctx : %p\n", ctx); + LOGD ("ctx : %p", ctx); if (ecore_imf_context_input_panel_enabled_get (ctx)) { if (!check_focus_out_by_popup_win (ctx)) @@ -1504,7 +1504,7 @@ isf_imf_context_cursor_position_set (Ecore_IMF_Context *ctx, int cursor_pos) if (context_scim && context_scim->impl && context_scim == _focused_ic) { if (context_scim->impl->cursor_pos != cursor_pos) { - LOGD ("ctx : %p, cursor pos : %d\n", ctx, cursor_pos); + LOGD ("ctx : %p, cursor pos : %d", ctx, cursor_pos); context_scim->impl->cursor_pos = cursor_pos; caps_mode_check (ctx, EINA_FALSE, EINA_TRUE); @@ -1868,7 +1868,7 @@ isf_imf_context_autocapital_type_set (Ecore_IMF_Context* ctx, Ecore_IMF_Autocapi context_scim->impl->autocapital_type = autocapital_type; if (context_scim == _focused_ic) { - LOGD ("ctx : %p. set autocapital type : %d\n", ctx, autocapital_type); + LOGD ("ctx : %p. set autocapital type : %d", ctx, autocapital_type); _panel_client.prepare (context_scim->id); //FIXME: must add this function for panelclient //context_scim->impl->si->set_autocapital_type (autocapital_type); @@ -1901,7 +1901,7 @@ isf_imf_context_filter_event (Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type, Eina_Bool ret = EINA_FALSE; if (ic == NULL || ic->impl == NULL) { - LOGW ("ic is NULL\n"); + LOGW ("ic is NULL"); return ret; } KeyEvent key; @@ -1930,7 +1930,7 @@ isf_imf_context_filter_event (Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type, _panel_client.prepare (ic->id); _panel_client.get_active_helper_option (&_active_helper_option); _panel_client.send (); - ISF_SAVE_LOG ("Changed keyboard mode from S/W to H/W (code: %x, name: %s)\n", key.code, ev->keyname); + ISF_SAVE_LOG ("Changed keyboard mode from S/W to H/W (code: %x, name: %s)", key.code, ev->keyname); LOGD ("Hardware keyboard mode, active helper option: %d", _active_helper_option); } } @@ -1945,14 +1945,14 @@ isf_imf_context_filter_event (Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type, if (type == ECORE_IMF_EVENT_KEY_DOWN || type == ECORE_IMF_EVENT_KEY_UP) { if ((timestamp == 0) && !_x_key_event_is_valid) { std::cerr << " S/W key event is not valid!!!\n"; - LOGW ("S/W key event is not valid\n"); + LOGW ("S/W key event is not valid"); return EINA_TRUE; } } if (type == ECORE_IMF_EVENT_KEY_DOWN) { Ecore_IMF_Event_Key_Down *ev = (Ecore_IMF_Event_Key_Down *)event; - SECURE_LOGD ("[Key-down event] ctx : %p, key_name: %s \n", ctx, ev->keyname); + SECURE_LOGD ("[Key-down event] ctx : %p, key_name: %s", ctx, ev->keyname); timestamp = ev->timestamp; scim_string_to_key (key, ev->key); scim_set_device_info (key, ev->dev_name ? ev->dev_name : "", ev->dev_class, ev->dev_subclass); @@ -1960,7 +1960,7 @@ isf_imf_context_filter_event (Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type, key.mask |= _ecore_imf_lock_to_scim_mask (ev->locks); } else if (type == ECORE_IMF_EVENT_KEY_UP) { Ecore_IMF_Event_Key_Up *ev = (Ecore_IMF_Event_Key_Up *)event; - SECURE_LOGD ("[Key-up event] ctx : %p, key_name: %s \n", ctx, ev->keyname); + SECURE_LOGD ("[Key-up event] ctx : %p, key_name: %s", ctx, ev->keyname); timestamp = ev->timestamp; scim_string_to_key (key, ev->key); scim_set_device_info (key, ev->dev_name ? ev->dev_name : "", ev->dev_class, ev->dev_subclass); @@ -1969,17 +1969,17 @@ isf_imf_context_filter_event (Ecore_IMF_Context *ctx, Ecore_IMF_Event_Type type, key.mask |= _ecore_imf_lock_to_scim_mask (ev->locks); } else if (type == ECORE_IMF_EVENT_MOUSE_UP) { if (ecore_imf_context_input_panel_enabled_get (ctx)) { - LOGD ("[Mouse-up event] ctx : %p\n", ctx); + LOGD ("[Mouse-up event] ctx : %p", ctx); if (ic == _focused_ic) { if (_change_keyboard_mode_by_touch && get_keyboard_mode () == TOOLBAR_KEYBOARD_MODE) { isf_imf_context_set_keyboard_mode (ctx, TOOLBAR_HELPER_MODE); - LOGD ("S/W keyboard mode by enabling ChangeKeyboardModeByTouch\n"); + LOGD ("S/W keyboard mode by enabling ChangeKeyboardModeByTouch"); } else { ecore_imf_context_input_panel_show (ctx); } } else - LOGE ("Can't show IME because there is no focus. ctx : %p\n", ctx); + LOGE ("Can't show IME because there is no focus. ctx : %p", ctx); } return EINA_FALSE; } else { @@ -2099,7 +2099,7 @@ isf_imf_context_input_hint_set (Ecore_IMF_Context *ctx, Ecore_IMF_Input_Hints hi context_scim->impl->input_hint = hint; if (context_scim == _focused_ic) { - LOGD ("ctx : %p, input hint : %#x\n", ctx, hint); + LOGD ("ctx : %p, input hint : %#x", ctx, hint); _panel_client.prepare (context_scim->id); _panel_client.set_input_hint (context_scim->id, hint); _panel_client.send (); @@ -2120,7 +2120,7 @@ isf_imf_context_bidi_direction_set (Ecore_IMF_Context *ctx, Ecore_IMF_BiDi_Direc context_scim->impl->bidi_direction = direction; if (context_scim == _focused_ic) { - LOGD ("ctx : %p, bidi direction : %#x\n", ctx, direction); + LOGD ("ctx : %p, bidi direction : %#x", ctx, direction); _panel_client.prepare (context_scim->id); _panel_client.update_bidi_direction (context_scim->id, direction); _panel_client.send (); @@ -2201,7 +2201,7 @@ feed_key_event (EcoreIMFContextISF *ic, const KeyEvent &key, bool fake) send_x_key_event (key, fake); return EINA_TRUE; } else { - LOGW ("Unknown key code : %d\n", key.code); + LOGW ("Unknown key code : %d", key.code); return EINA_FALSE; } } @@ -2214,7 +2214,7 @@ panel_slot_commit_string (int context, const WideString &wstr) if (ic && ic->impl) { if (_focused_ic != ic) { - LOGW ("focused_ic is different from ic\n"); + LOGW ("focused_ic is different from ic"); return; } @@ -2226,7 +2226,7 @@ panel_slot_commit_string (int context, const WideString &wstr) ecore_imf_context_commit_event_add (ic->ctx, utf8_wcstombs (wstr).c_str ()); ecore_imf_context_event_callback_call (ic->ctx, ECORE_IMF_CALLBACK_COMMIT, const_cast(utf8_wcstombs (wstr).c_str ())); } else { - LOGW ("No ic\n"); + LOGW ("No ic"); } } @@ -2235,20 +2235,20 @@ panel_slot_forward_key_event (int context, const KeyEvent &key) { EcoreIMFContextISF *ic = find_ic (context); SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << " context=" << context << " key=" << key.get_key_string () << " ic=" << ic << "\n"; - LOGD ("forward key event requested\n"); + LOGD ("forward key event requested"); if (!(ic && ic->impl)) { - LOGW ("No ic\n"); + LOGW ("No ic"); return; } if ((_focused_ic != NULL) && (_focused_ic != ic)) { - LOGW ("focused_ic : %p, ic : %p\n", _focused_ic, ic); + LOGW ("focused_ic : %p, ic : %p", _focused_ic, ic); return; } if (key.get_key_string ().length () >= 116) { - LOGW ("the length of key string is too long\n"); + LOGW ("the length of key string is too long"); return; } @@ -2647,7 +2647,7 @@ initialize (void) String config_module_name = "socket"; int ret = -1; - LOGD ("Initializing Ecore ISF IMModule...\n"); + LOGD ("Initializing Ecore ISF IMModule..."); // Get system language. _language = scim_get_locale_language (scim_get_current_locale ()); @@ -2658,7 +2658,7 @@ initialize (void) } if (_config.null ()) { - LOGW ("Config module cannot be loaded, using dummy Config.\n"); + LOGW ("Config module cannot be loaded, using dummy Config."); _config = new DummyConfig (); config_module_name = "dummy"; } @@ -2671,7 +2671,7 @@ initialize (void) ret = ecore_x_window_prop_xid_get (ecore_x_window_root_first_get (), atom, ECORE_X_ATOM_WINDOW, &_input_win, 1); if (_input_win == 0 || ret < 1) { - LOGW ("Input window is NULL!\n"); + LOGW ("Input window is NULL!"); } // Attach Panel Client signal. //FIXME:remove this signal @@ -2718,7 +2718,7 @@ initialize (void) static void finalize (void) { - LOGD ("Finalizing Ecore ISF IMModule...\n"); + LOGD ("Finalizing Ecore ISF IMModule..."); SCIM_DEBUG_FRONTEND(2) << "Finalize all IC partially.\n"; while (_used_ic_impl_list) { @@ -2910,14 +2910,14 @@ static void send_x_key_event (const KeyEvent &key, bool fake) Display *display = (Display *)ecore_x_display_get (); if (display == NULL) { std::cerr << "ecore_x_display_get () failed\n"; - LOGW ("ecore_x_display_get () failed\n"); + LOGW ("ecore_x_display_get () failed"); return; } // Check focus window XGetInputFocus (display, &focus_win, &revert); if (focus_win == None) { - LOGW ("Input focus window is None\n"); + LOGW ("Input focus window is None"); return; } @@ -2936,7 +2936,7 @@ static void send_x_key_event (const KeyEvent &key, bool fake) // get x keysym, keycode, keyname, and key keysym = XStringToKeysym (keysym_str); if (keysym == NoSymbol) { - LOGW ("NoSymbol\n"); + LOGW ("NoSymbol"); return; } @@ -2951,7 +2951,7 @@ static void send_x_key_event (const KeyEvent &key, bool fake) } if (keycode == 0) { - LOGW ("No Key code in the current keymap table\n"); + LOGW ("No Key code in the current keymap table"); return; } diff --git a/ism/extras/efl_immodule/isf_imf_control_ui.cpp b/ism/extras/efl_immodule/isf_imf_control_ui.cpp index cf19ffe..27eccbd 100644 --- a/ism/extras/efl_immodule/isf_imf_control_ui.cpp +++ b/ism/extras/efl_immodule/isf_imf_control_ui.cpp @@ -86,7 +86,7 @@ Ecore_IMF_Context *get_using_ic (Ecore_IMF_Input_Panel_Event type, int value) { static void _render_post_cb (void *data, Evas *e, void *event_info) { - LOGD ("[_render_post_cb], conformant_reset_done = 1\n"); + LOGD ("[_render_post_cb], conformant_reset_done = 1"); evas_event_callback_del_full (e, EVAS_CALLBACK_RENDER_POST, _render_post_cb, NULL); conformant_reset_done = EINA_TRUE; isf_imf_context_input_panel_send_will_hide_ack (get_using_ic (ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_SHOW)); @@ -94,7 +94,7 @@ static void _render_post_cb (void *data, Evas *e, void *event_info) static void _candidate_render_post_cb (void *data, Evas *e, void *event_info) { - LOGD ("[%s], candidate_conformant_reset_done = 1\n", __func__); + LOGD ("[%s], candidate_conformant_reset_done = 1", __func__); evas_event_callback_del_full (e, EVAS_CALLBACK_RENDER_POST, _candidate_render_post_cb, NULL); candidate_conformant_reset_done = EINA_TRUE; isf_imf_context_input_panel_send_candidate_will_hide_ack (get_using_ic (ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_SHOW)); @@ -157,24 +157,24 @@ static Eina_Bool _prop_change (void *data, int ev_type, void *ev) sx = sy = sw = sh = 0; if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) { - LOGD ("conformant_reset_done = 0, candidate_conformant_reset_done = 0, registering _render_post_cb\n"); + LOGD ("conformant_reset_done = 0, candidate_conformant_reset_done = 0, registering _render_post_cb"); conformant_reset_done = EINA_FALSE; candidate_conformant_reset_done = EINA_FALSE; if (active_context_canvas && _conformant_get ()) { evas_event_callback_add (active_context_canvas, EVAS_CALLBACK_RENDER_POST, _render_post_cb, NULL); } - LOGD ("[ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF] geometry x : %d, y : %d, w : %d, h : %d\n", sx, sy, sw, sh); + LOGD ("[ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF] geometry x : %d, y : %d, w : %d, h : %d", sx, sy, sw, sh); } else if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON) { - LOGD ("conformant_reset_done = 0, candidate_conformant_reset_done = 0, registering _candidate_render_post_cb\n"); + LOGD ("conformant_reset_done = 0, candidate_conformant_reset_done = 0, registering _candidate_render_post_cb"); conformant_reset_done = EINA_FALSE; candidate_conformant_reset_done = EINA_FALSE; _clear_will_show_timer (); if (active_context_canvas && _conformant_get ()) { evas_event_callback_add (active_context_canvas, EVAS_CALLBACK_RENDER_POST, _candidate_render_post_cb, NULL); } - LOGD ("[ECORE_X_VIRTUAL_KEYBOARD_STATE_ON] geometry x : %d, y : %d, w : %d, h : %d\n", sx, sy, sw, sh); + LOGD ("[ECORE_X_VIRTUAL_KEYBOARD_STATE_ON] geometry x : %d, y : %d, w : %d, h : %d", sx, sy, sw, sh); } } } else { @@ -243,7 +243,7 @@ static void _event_callback_call (Ecore_IMF_Input_Panel_Event type, int value) case ECORE_IMF_INPUT_PANEL_STATE_EVENT: switch (value) { case ECORE_IMF_INPUT_PANEL_STATE_HIDE: - SECURE_LOGD ("[input panel has been hidden] ctx : %p\n", using_ic); + SECURE_LOGD ("[input panel has been hidden] ctx : %p", using_ic); if (hide_req_ic == show_req_ic) show_req_ic = NULL; @@ -251,10 +251,10 @@ static void _event_callback_call (Ecore_IMF_Input_Panel_Event type, int value) will_hide = EINA_FALSE; break; case ECORE_IMF_INPUT_PANEL_STATE_SHOW: - SECURE_LOGD ("[input panel has been shown] ctx : %p\n", using_ic); + SECURE_LOGD ("[input panel has been shown] ctx : %p", using_ic); break; case ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW: - SECURE_LOGD ("[input panel will be shown] ctx : %p\n", using_ic); + SECURE_LOGD ("[input panel will be shown] ctx : %p", using_ic); break; default: break; @@ -262,22 +262,22 @@ static void _event_callback_call (Ecore_IMF_Input_Panel_Event type, int value) notified_state = (Ecore_IMF_Input_Panel_State)value; break; case ECORE_IMF_INPUT_PANEL_LANGUAGE_EVENT: - SECURE_LOGD ("[language is changed] ctx : %p\n", using_ic); + SECURE_LOGD ("[language is changed] ctx : %p", using_ic); break; case ECORE_IMF_INPUT_PANEL_SHIFT_MODE_EVENT: - SECURE_LOGD ("[shift mode is changed] ctx : %p\n", using_ic); + SECURE_LOGD ("[shift mode is changed] ctx : %p", using_ic); break; case ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT: - SECURE_LOGD ("[input panel geometry is changed] ctx : %p\n", using_ic); + SECURE_LOGD ("[input panel geometry is changed] ctx : %p", using_ic); break; case ECORE_IMF_CANDIDATE_PANEL_STATE_EVENT: - SECURE_LOGD ("[candidate state is changed] ctx : %p, %d\n", using_ic, value); + SECURE_LOGD ("[candidate state is changed] ctx : %p, %d", using_ic, value); break; case ECORE_IMF_CANDIDATE_PANEL_GEOMETRY_EVENT: - SECURE_LOGD ("[candidate geometry is changed] ctx : %p\n", using_ic); + SECURE_LOGD ("[candidate geometry is changed] ctx : %p", using_ic); break; case ECORE_IMF_INPUT_PANEL_KEYBOARD_MODE_EVENT: - SECURE_LOGD ("[keyboard mode is changed] ctx : %p, mode(0:S/W, 1:H/W): %d \n", using_ic, value); + SECURE_LOGD ("[keyboard mode is changed] ctx : %p, mode(0:S/W, 1:H/W): %d ", using_ic, value); break; default: break; @@ -289,14 +289,14 @@ static void _event_callback_call (Ecore_IMF_Input_Panel_Event type, int value) if (type == ECORE_IMF_CANDIDATE_PANEL_STATE_EVENT) { if (value == ECORE_IMF_CANDIDATE_PANEL_HIDE) { if (notified_state != ECORE_IMF_INPUT_PANEL_STATE_HIDE) { - SECURE_LOGD ("received_candidate_will_hide_event = 1\n"); + SECURE_LOGD ("received_candidate_will_hide_event = 1"); received_candidate_will_hide_event = TRUE; isf_imf_context_input_panel_send_candidate_will_hide_ack (using_ic); } else { - SECURE_LOGD ("received_candidate_will_hide_event != 1, due to notified_state\n"); + SECURE_LOGD ("received_candidate_will_hide_event != 1, due to notified_state"); } } else if (value == ECORE_IMF_INPUT_PANEL_STATE_SHOW) { - SECURE_LOGD ("received_candidate_will_hide_event = 0\n"); + SECURE_LOGD ("received_candidate_will_hide_event = 0"); received_candidate_will_hide_event = EINA_FALSE; } } @@ -334,7 +334,7 @@ static void _send_input_panel_hide_request () _win_focus_out_handler_del (); - SECURE_LOGD ("Send input panel hide request\n"); + SECURE_LOGD ("Send input panel hide request"); _isf_imf_context_input_panel_hide (get_panel_client_id (), hide_context_id); hide_context_id = -1; @@ -350,7 +350,7 @@ static Eina_Bool _hide_timer_handler (void *data) static Eina_Bool _will_show_timer_handler (void *data) { - SECURE_LOGD ("reset input panel state as HIDE\n"); + SECURE_LOGD ("reset input panel state as HIDE"); input_panel_state = ECORE_IMF_INPUT_PANEL_STATE_HIDE; will_show_timer = NULL; @@ -404,7 +404,7 @@ static Eina_Bool _client_window_focus_out_cb (void *data, int ev_type, void *ev) Ecore_X_Window focus_out_win = e->win; Ecore_X_Window focus_in_win = ecore_x_window_focus_get (); - LOGD ("ctx : %p, client_window : %#x, focus-out win : %#x, focus-in win : %#x\n", ctx, client_win, focus_out_win, focus_in_win); + LOGD ("ctx : %p, client_window : %#x, focus-out win : %#x, focus-in win : %#x", ctx, client_win, focus_out_win, focus_in_win); if (check_focus_out_by_popup_win (ctx)) return ECORE_CALLBACK_PASS_ON; @@ -437,18 +437,18 @@ Eina_Bool check_focus_out_by_popup_win (Ecore_IMF_Context *ctx) if (!ecore_x_netwm_window_type_get (focus_win, &win_type)) return EINA_FALSE; - LOGD ("win type : %d\n", win_type); + LOGD ("win type : %d", win_type); if (win_type == ECORE_X_WINDOW_TYPE_POPUP_MENU || win_type == ECORE_X_WINDOW_TYPE_NOTIFICATION) { - LOGD ("client window : %#x, focus window : %#x\n", client_win, focus_win); + LOGD ("client window : %#x, focus window : %#x", client_win, focus_win); if (client_win != focus_win) { ret = EINA_TRUE; ecore_x_icccm_name_class_get (focus_win, NULL, &class_name); if (class_name) { - LOGD ("window class name : %s\n", class_name); + LOGD ("window class name : %s", class_name); for (unsigned int i = 0; i < lock_screen_class_names.size (); ++i) { if (!strcmp (class_name, lock_screen_class_names [i].c_str ())) { ret = EINA_FALSE; @@ -508,7 +508,7 @@ void isf_imf_input_panel_init (void) kbd_mode = TOOLBAR_HELPER_MODE; } } - LOGD ("keyboard mode(0:H/W Keyboard, 1:S/W Keyboard): %d\n", kbd_mode); + LOGD ("keyboard mode(0:H/W Keyboard, 1:S/W Keyboard): %d", kbd_mode); } void isf_imf_input_panel_shutdown (void) @@ -520,11 +520,11 @@ void isf_imf_input_panel_shutdown (void) _send_input_panel_hide_request (); } else - LOGD ("No hide timer\n"); + LOGD ("No hide timer"); } candidate_conformant_reset_done = TRUE; - SECURE_LOGD ("candidate_conformant_reset_done = 1\n"); + SECURE_LOGD ("candidate_conformant_reset_done = 1"); Ecore_IMF_Context *active_ctx = get_using_ic (ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_SHOW); if (active_ctx) { @@ -555,7 +555,7 @@ void isf_imf_context_input_panel_show (Ecore_IMF_Context* ctx) save_current_xid (ctx); if (kbd_mode == TOOLBAR_KEYBOARD_MODE) { - LOGD ("H/W keyboard is existed.\n"); + LOGD ("H/W keyboard is existed."); return; } @@ -602,7 +602,7 @@ void isf_imf_context_input_panel_show (Ecore_IMF_Context* ctx) Ecore_IMF_Input_Panel_State state = ecore_imf_context_input_panel_state_get (ctx); if (state == ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW || state == ECORE_IMF_INPUT_PANEL_STATE_SHOW) { - LOGD ("already show\n"); + LOGD ("already show"); return; } } @@ -634,15 +634,15 @@ void isf_imf_context_input_panel_show (Ecore_IMF_Context* ctx) iseContext.bidi_direction = ecore_imf_context_bidi_direction_get (ctx); - SECURE_LOGD ("ctx : %p, layout : %d, layout variation : %d\n", ctx, iseContext.layout, iseContext.layout_variation); - SECURE_LOGD ("language : %d, cursor position : %d, caps mode : %d\n", iseContext.language, iseContext.cursor_pos, iseContext.caps_mode); - SECURE_LOGD ("return_key_type : %d, return_key_disabled : %d, autocapital type : %d\n", iseContext.return_key_type, iseContext.return_key_disabled, iseContext.autocapital_type); - SECURE_LOGD ("client_window : %#x, password mode : %d, prediction_allow : %d\n", iseContext.client_window, iseContext.password_mode, iseContext.prediction_allow); - SECURE_LOGD ("input hint : %#x\n", iseContext.input_hint); - SECURE_LOGD ("bidi direction : %d\n", iseContext.bidi_direction); + SECURE_LOGD ("ctx : %p, layout : %d, layout variation : %d", ctx, iseContext.layout, iseContext.layout_variation); + SECURE_LOGD ("language : %d, cursor position : %d, caps mode : %d", iseContext.language, iseContext.cursor_pos, iseContext.caps_mode); + SECURE_LOGD ("return_key_type : %d, return_key_disabled : %d, autocapital type : %d", iseContext.return_key_type, iseContext.return_key_disabled, iseContext.autocapital_type); + SECURE_LOGD ("client_window : %#x, password mode : %d, prediction_allow : %d", iseContext.client_window, iseContext.password_mode, iseContext.prediction_allow); + SECURE_LOGD ("input hint : %#x", iseContext.input_hint); + SECURE_LOGD ("bidi direction : %d", iseContext.bidi_direction); if (iseContext.client_window != ecore_x_window_focus_get ()) { - LOGW ("Client window is different from focus window. client win : %#x, focus win : %#x\n", iseContext.client_window, ecore_x_window_focus_get ()); + LOGW ("Client window is different from focus window. client win : %#x, focus win : %#x", iseContext.client_window, ecore_x_window_focus_get ()); } /* calculate packet size */ @@ -679,7 +679,7 @@ void isf_imf_context_input_panel_show (Ecore_IMF_Context* ctx) void isf_imf_context_input_panel_hide (Ecore_IMF_Context *ctx) { - SECURE_LOGD ("ctx : %p\n", ctx); + SECURE_LOGD ("ctx : %p", ctx); _input_panel_hide (ctx, EINA_FALSE); } @@ -694,7 +694,7 @@ void isf_imf_context_input_panel_language_set (Ecore_IMF_Context *ctx, Ecore_IMF EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get (ctx); if (context_scim == get_focused_ic ()) { - SECURE_LOGD ("language mode : %d\n", language); + SECURE_LOGD ("language mode : %d", language); _isf_imf_context_input_panel_language_set (_get_context_id (ctx), language); } } @@ -707,7 +707,7 @@ void isf_imf_context_input_panel_language_locale_get (Ecore_IMF_Context *ctx, ch void isf_imf_context_input_panel_caps_mode_set (Ecore_IMF_Context *ctx, unsigned int mode) { - SECURE_LOGD ("ctx : %p, mode : %d\n", ctx, mode); + SECURE_LOGD ("ctx : %p, mode : %d", ctx, mode); _isf_imf_context_input_panel_caps_mode_set (_get_context_id (ctx), mode); } @@ -760,7 +760,7 @@ void isf_imf_context_input_panel_geometry_get (Ecore_IMF_Context *ctx, int *x, i { _isf_imf_context_input_panel_geometry_get (_get_context_id (ctx), x, y, w, h); - SECURE_LOGD ("ctx : %p, x : %d, y : %d, w : %d, h : %d\n", ctx, *x, *y, *w, *h); + SECURE_LOGD ("ctx : %p, x : %d, y : %d, w : %d, h : %d", ctx, *x, *y, *w, *h); } /** @@ -774,7 +774,7 @@ void isf_imf_context_input_panel_return_key_type_set (Ecore_IMF_Context *ctx, Ec EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get (ctx); if (context_scim == get_focused_ic ()) { - SECURE_LOGD ("Return key type : %d\n", type); + SECURE_LOGD ("Return key type : %d", type); _isf_imf_context_input_panel_return_key_type_set (_get_context_id (ctx), type); } } @@ -808,7 +808,7 @@ void isf_imf_context_input_panel_return_key_disabled_set (Ecore_IMF_Context *ctx EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get (ctx); if (context_scim == get_focused_ic ()) { - SECURE_LOGD ("Return key disabled : %d\n", disabled); + SECURE_LOGD ("Return key disabled : %d", disabled); _isf_imf_context_input_panel_return_key_disabled_set (_get_context_id (ctx), disabled); } } @@ -843,7 +843,7 @@ isf_imf_context_input_panel_layout_set (Ecore_IMF_Context *ctx, Ecore_IMF_Input_ EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get (ctx); if (context_scim == get_focused_ic ()) { - SECURE_LOGD ("layout type : %d\n", layout); + SECURE_LOGD ("layout type : %d", layout); _isf_imf_context_input_panel_layout_set (_get_context_id (ctx), layout); imengine_layout_set (ctx, layout); } @@ -875,7 +875,7 @@ Ecore_IMF_Input_Panel_State isf_imf_context_input_panel_state_get (Ecore_IMF_Con { Ecore_IMF_Input_Panel_State state; _isf_imf_context_input_panel_state_get (_get_context_id (ctx), state); - LOGD (" state:%d\n", state); + LOGD ("state:%d", state); return state; } @@ -907,7 +907,7 @@ void isf_imf_context_candidate_window_geometry_get (Ecore_IMF_Context *ctx, int { _isf_imf_context_candidate_window_geometry_get (_get_context_id (ctx), x, y, w, h); - SECURE_LOGD ("ctx : %p, x : %d, y : %d, w : %d, h : %d\n", ctx, *x, *y, *w, *h); + SECURE_LOGD ("ctx : %p, x : %d, y : %d, w : %d, h : %d", ctx, *x, *y, *w, *h); } void isf_imf_context_input_panel_send_will_show_ack (Ecore_IMF_Context *ctx) @@ -919,12 +919,12 @@ void isf_imf_context_input_panel_send_will_hide_ack (Ecore_IMF_Context *ctx) { if (_conformant_get ()) { if (conformant_reset_done && received_will_hide_event) { - LOGD ("Send will hide ack, conformant_reset_done = 0, received_will_hide_event = 0\n"); + LOGD ("Send will hide ack, conformant_reset_done = 0, received_will_hide_event = 0"); _isf_imf_context_input_panel_send_will_hide_ack (_get_context_id (ctx)); conformant_reset_done = EINA_FALSE; received_will_hide_event = EINA_FALSE; } else { - LOGD ("conformant_reset_done=%d, received_will_hide_event=%d\n", + LOGD ("conformant_reset_done=%d, received_will_hide_event=%d", conformant_reset_done, received_will_hide_event); } } else { @@ -938,7 +938,7 @@ void isf_imf_context_set_keyboard_mode (Ecore_IMF_Context *ctx, TOOLBAR_MODE_T m if (_support_hw_keyboard_mode) { kbd_mode = mode; - SECURE_LOGD ("keyboard mode : %d\n", kbd_mode); + SECURE_LOGD ("keyboard mode : %d", kbd_mode); will_hide = EINA_TRUE; hide_req_ic = ctx; _isf_imf_context_set_keyboard_mode (_get_context_id (ctx), mode); @@ -949,13 +949,13 @@ void isf_imf_context_input_panel_send_candidate_will_hide_ack (Ecore_IMF_Context { if (_conformant_get ()) { if (candidate_conformant_reset_done && received_candidate_will_hide_event) { - LOGD ("Send candidate will hide ack, cand_conf_reset_done = 0, recv_cand_will_hide = 0\n"); + LOGD ("Send candidate will hide ack, cand_conf_reset_done = 0, recv_cand_will_hide = 0"); _isf_imf_context_input_panel_send_candidate_will_hide_ack (_get_context_id (ctx)); candidate_conformant_reset_done = EINA_FALSE; received_candidate_will_hide_event = EINA_FALSE; } else { - LOGD ("isf_imf_context_input_panel_send_will_hide_ack, cand_conf_reset_done=%d recv_cand_will_hide=%d\n", + LOGD ("isf_imf_context_input_panel_send_will_hide_ack, cand_conf_reset_done=%d recv_cand_will_hide=%d", candidate_conformant_reset_done, received_candidate_will_hide_event); } } else { @@ -968,7 +968,7 @@ void isf_imf_context_input_panel_input_mode_set (Ecore_IMF_Context *ctx, Ecore_I EcoreIMFContextISF *context_scim = (EcoreIMFContextISF *)ecore_imf_context_data_get (ctx); if (context_scim == get_focused_ic ()) { - SECURE_LOGD ("input mode : %d\n", input_mode); + SECURE_LOGD ("input mode : %d", input_mode); _isf_imf_context_input_panel_input_mode_set (_get_context_id (ctx), input_mode); } } @@ -986,7 +986,7 @@ static bool _process_ise_panel_showed (void) _event_callback_call (ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_SHOW); received_will_hide_event = EINA_FALSE; - LOGD ("received_will_hide_event = 0\n"); + LOGD ("received_will_hide_event = 0"); return true; } @@ -1006,7 +1006,7 @@ static bool _process_ise_panel_hided (void) _event_callback_call (ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_HIDE); received_will_hide_event = EINA_TRUE; - LOGD ("received_will_hide_event = 1\n"); + LOGD ("received_will_hide_event = 1"); isf_imf_context_input_panel_send_will_hide_ack (get_using_ic (ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_HIDE)); return true; diff --git a/ism/extras/efl_immodule/isf_imf_module.cpp b/ism/extras/efl_immodule/isf_imf_module.cpp index cc4c2f2..1189076 100644 --- a/ism/extras/efl_immodule/isf_imf_module.cpp +++ b/ism/extras/efl_immodule/isf_imf_module.cpp @@ -101,7 +101,7 @@ extern "C" ctxd = isf_imf_context_new (); if (!ctxd) { - LOGW ("isf_imf_context_new () failed!!!\n"); + LOGW ("isf_imf_context_new () failed!!!"); return NULL; } diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp index f403cec..f92a298 100644 --- a/ism/extras/efl_panel/isf_panel_efl.cpp +++ b/ism/extras/efl_panel/isf_panel_efl.cpp @@ -554,7 +554,7 @@ static void get_input_window (void) atom = ecore_x_atom_get (E_PROP_DEVICEMGR_INPUTWIN); win_ret = ecore_x_window_prop_window_get (ecore_x_window_root_first_get (), atom, &_input_win, 1); if (_input_win == 0 || win_ret < 1) { - LOGW ("Input window is NULL!\n"); + LOGW ("Input window is NULL!"); } else { ecore_x_event_mask_set (_input_win, ECORE_X_EVENT_MASK_WINDOW_PROPERTY); } @@ -568,11 +568,11 @@ static int pkgmgr_get_appinfo (const char *appid, pkgmgrinfo_appinfo_h *handle) /* Try to get in global packages */ ret = pkgmgrinfo_appinfo_get_appinfo (appid, handle); if (ret != PMINFO_R_OK) { - LOGW ("[pkgmgrinfo_appinfo_get_appinfo] appid : '%s', ret : %d\n", appid, ret); + LOGW ("[pkgmgrinfo_appinfo_get_appinfo] appid : '%s', ret : %d", appid, ret); /* Try to get in user packages */ ret = pkgmgrinfo_appinfo_get_usr_appinfo (appid, getuid (), handle); if (ret != PMINFO_R_OK) - LOGW ("[pkgmgrinfo_appinfo_get_usr_appinfo] appid : '%s', ret : %d\n", appid, ret); + LOGW ("[pkgmgrinfo_appinfo_get_usr_appinfo] appid : '%s', ret : %d", appid, ret); } return ret; @@ -584,44 +584,44 @@ static void usb_keyboard_signal_cb (void *data, DBusMessage *msg) char *str = NULL; if (!msg) { - LOGW ("No Message\n"); + LOGW ("No Message"); return; } if (dbus_message_is_signal (msg, HOST_INTERFACE_NAME, HOST_KEYBOARD_SIGNAL) == 0) { - LOGW ("HOST_KEYBOARD_SIGNAL\n"); + LOGW ("HOST_KEYBOARD_SIGNAL"); return; } dbus_error_init (&err); if (dbus_message_get_args (msg, &err, DBUS_TYPE_STRING, &str, DBUS_TYPE_INVALID) == 0) { - LOGW ("DBUS_TYPE_INVALID\n"); + LOGW ("DBUS_TYPE_INVALID"); return; } if (!str) return; if (!strncmp (str, HOST_ADDED, strlen (HOST_ADDED))) { - LOGD ("HOST_ADDED\n"); + LOGD ("HOST_ADDED"); return; } if (!strncmp (str, HOST_REMOVED, strlen (HOST_REMOVED))) { - LOGD ("HOST_REMOVED\n"); + LOGD ("HOST_REMOVED"); if (_info_manager->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) { change_keyboard_mode (TOOLBAR_HELPER_MODE); } return; } - LOGW ("ERROR: msg (%s) is improper\n", str); + LOGW ("ERROR: msg (%s) is improper", str); } static void unregister_edbus_signal_handler (void) { if (edbus_conn) { - LOGD ("unregister signal handler for keyboard\n"); + LOGD ("unregister signal handler for keyboard"); if (edbus_handler) { e_dbus_signal_handler_del (edbus_conn, edbus_handler); edbus_handler = NULL; @@ -635,30 +635,30 @@ static void unregister_edbus_signal_handler (void) static int register_edbus_signal_handler (void) { int retry; - LOGD ("start register_edbus_signal_handler\n"); + LOGD ("start register_edbus_signal_handler"); retry = 0; while (e_dbus_init () == 0) { retry++; if (retry >= 10) { - LOGW ("retry fail\n"); + LOGW ("retry fail"); return -1; } } edbus_conn = e_dbus_bus_get (DBUS_BUS_SYSTEM); if (!edbus_conn) { - LOGW ("connection fail\n"); + LOGW ("connection fail"); return -1; } edbus_handler = e_dbus_signal_handler_add (edbus_conn, NULL, HOST_OBJECT_PATH, HOST_INTERFACE_NAME, HOST_KEYBOARD_SIGNAL, usb_keyboard_signal_cb, NULL); if (!edbus_handler) { - LOGW ("cannot register signal\n"); + LOGW ("cannot register signal"); return -1; } - LOGD ("Success register\n"); + LOGD ("Success register"); return 0; } @@ -672,7 +672,7 @@ static void delete_notification (NotificationData *noti_data) if (noti_data->noti_id != 0) { notification_delete_by_priv_id ("isf-panel-efl", NOTIFICATION_TYPE_ONGOING, noti_data->noti_id); - LOGD ("deleted notification : %s\n", noti_data->launch_app.c_str ()); + LOGD ("deleted notification : %s", noti_data->launch_app.c_str ()); noti_data->noti_id = 0; } } @@ -714,17 +714,17 @@ static void create_notification (NotificationData *noti_data) notification_set_launch_option (notification, NOTIFICATION_LAUNCH_OPTION_APP_CONTROL, (void *)service); ret = notification_insert (notification, ¬i_data->noti_id); if (ret != NOTIFICATION_ERROR_NONE) { - LOGW ("Failed to insert notification. error code : %d\n", ret); + LOGW ("Failed to insert notification. error code : %d", ret); } app_control_destroy (service); } else { - LOGW ("Failed to create appcontrol\n"); + LOGW ("Failed to create appcontrol"); } notification_free (notification); } else { - LOGW ("Failed to create notification\n"); + LOGW ("Failed to create notification"); } } #endif /* HAVE_NOTIFICATION */ @@ -734,7 +734,7 @@ static bool tokenize_tag (const String& str, struct image *image_token) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " str=" << str << ", length=" << str.length () << "\n"; if (str.length () <= 0) { - LOGW ("str is empty!!!\n"); + LOGW ("str is empty!!!"); return false; } @@ -762,7 +762,7 @@ static bool tokenize_tag (const String& str, struct image *image_token) if (i - 1 < EMOJI_IMAGE_END) image_token->emoji_option [i - 1] = atoi (tag_str[i]); else - LOGW ("emoji option is more than EMOJI_IMAGE_END!!!\n"); + LOGW ("emoji option is more than EMOJI_IMAGE_END!!!"); } } @@ -827,7 +827,7 @@ static Evas_Object* get_candidate (const String& str, Evas_Object *parent, int * elm_image_animated_set (_candidate_image [_candidate_image_count], EINA_TRUE); elm_image_animated_play_set (_candidate_image [_candidate_image_count], EINA_TRUE); elm_image_object_size_get (_candidate_image [_candidate_image_count], &image_get_width, &image_get_height); - LOGD ("image_path=%s, key=%s\n", image_data.path.c_str (), image_key); + LOGD ("image_path=%s, key=%s", image_data.path.c_str (), image_key); if (image_get_height > image_get_width) image_rate = ((double)candidate_image_height / (double)image_get_width); @@ -1063,7 +1063,7 @@ static struct rectinfo get_ise_geometry () } } - LOGD ("angle : %d, w_angle : %d, mode : %d, Geometry : %d %d %d %d\n", + LOGD ("angle : %d, w_angle : %d, mode : %d, Geometry : %d %d %d %d", angle, _ise_angle, _info_manager->get_current_toolbar_mode (), info.pos_x, info.pos_y, info.width, info.height); @@ -1136,7 +1136,7 @@ static void set_keyboard_geometry_atom_info (Ecore_X_Window window, struct recti } ecore_x_e_illume_keyboard_geometry_set (window, ise_rect.pos_x, ise_rect.pos_y, ise_rect.width, ise_rect.height); - LOGD ("KEYBOARD_GEOMETRY_SET : %d %d %d %d\n", ise_rect.pos_x, ise_rect.pos_y, ise_rect.width, ise_rect.height); + LOGD ("KEYBOARD_GEOMETRY_SET : %d %d %d %d", ise_rect.pos_x, ise_rect.pos_y, ise_rect.width, ise_rect.height); SCIM_DEBUG_MAIN (3) << " KEYBOARD_GEOMETRY x=" << ise_rect.pos_x << " y=" << ise_rect.pos_y << " width=" << ise_rect.width << " height=" << ise_rect.height << "\n"; @@ -1257,7 +1257,7 @@ static int _isf_insert_ime_info_by_pkgid(const char *pkgid) bool user = false; if (!pkgid) { - LOGW ("pkgid is null.\n"); + LOGW ("pkgid is null."); return 0; } @@ -1267,7 +1267,7 @@ static int _isf_insert_ime_info_by_pkgid(const char *pkgid) /* Try to get in user packages */ ret = pkgmgrinfo_pkginfo_get_usr_pkginfo (pkgid, uid, &handle); if (ret != PMINFO_R_OK) { - LOGW ("Failed to call pkgmgrinfo_pkginfo_get_pkginfo & get_usr_pkginfo(\"%s\",~) returned %d\n", pkgid, ret); + LOGW ("Failed to call pkgmgrinfo_pkginfo_get_pkginfo & get_usr_pkginfo(\"%s\",~) returned %d", pkgid, ret); return 0; } else { @@ -1285,7 +1285,7 @@ static int _isf_insert_ime_info_by_pkgid(const char *pkgid) } if (ret != PMINFO_R_OK) { - LOGW ("Failed to call %s failed(%d)\n", user ? "pkgmgrinfo_appinfo_get_usr_list" : "pkgmgrinfo_appinfo_get_list", ret); + LOGW ("Failed to call %s failed(%d)", user ? "pkgmgrinfo_appinfo_get_usr_list" : "pkgmgrinfo_appinfo_get_list", ret); ret = 0; } @@ -1318,7 +1318,7 @@ static Eina_Bool _start_default_helper_timer(void *data) if (total_appids.size() > 0) _info_manager->update_ise_list (total_appids); - LOGD ("Try to start the initial helper\n"); + LOGD ("Try to start the initial helper"); set_active_ise(_initial_ise_uuid, true); for (iter = g_pkgids_to_be_uninstalled.begin (); iter != g_pkgids_to_be_uninstalled.end (); iter++) { @@ -1424,10 +1424,10 @@ static void _package_manager_event_cb (const char *type, const char *package, pa if (ret > 1 && _soft_keyboard_launched) { // If the previous appid of pkgid is the current IME, restart it with new appid. current_ime_appid = scim_global_config_read(String(SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), _initial_ise_uuid); if (current_ime_appid.compare (appids.front ()) == 0) { - LOGD ("Stop IME(%s)\n", current_ime_appid.c_str ()); + LOGD ("Stop IME(%s)", current_ime_appid.c_str ()); _info_manager->hide_helper (current_ime_appid); _info_manager->stop_helper (current_ime_appid); - LOGD ("Start IME(%s)\n", appids.back ().c_str ()); + LOGD ("Start IME(%s)", appids.back ().c_str ()); scim_global_config_write (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), appids.back ()); set_keyboard_engine (String (SCIM_COMPOSE_KEY_FACTORY_UUID)); _info_manager->start_helper (appids.back ()); @@ -1443,7 +1443,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa if (std::find(appids.begin(), appids.end(), current_ime_appid) != appids.end()) { // If the current ISE package is updated, restart it. for (it = _ime_info.begin (); it != _ime_info.end (); it++) { if (it->mode == TOOLBAR_HELPER_MODE && it->appid.compare(current_ime_appid) == 0) { // Make sure it's Helper ISE... - LOGD ("Restart IME(%s)\n", current_ime_appid.c_str ()); + LOGD ("Restart IME(%s)", current_ime_appid.c_str ()); _info_manager->hide_helper (current_ime_appid); _info_manager->stop_helper (current_ime_appid); _info_manager->start_helper (current_ime_appid); @@ -1469,7 +1469,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa if (_soft_keyboard_launched && std::find(appids.begin(), appids.end(), current_ime_appid) != appids.end()) { // If the updated IME is the current ISE... for (it = _ime_info.begin (); it != _ime_info.end (); it++) { if (it->appid.compare(current_ime_appid) == 0 && it->mode == TOOLBAR_HELPER_MODE) { // Make sure it's Helper ISE... - LOGD ("Stop IME(%s)\n", current_ime_appid.c_str ()); + LOGD ("Stop IME(%s)", current_ime_appid.c_str ()); _info_manager->hide_helper (current_ime_appid); _info_manager->stop_helper (current_ime_appid); _soft_keyboard_launched = false; @@ -1480,7 +1480,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa } if (appids.size () > 0) // Probably appids size is 1. - LOGD ("Delete IME(%s)\n", appids[0].c_str ()); + LOGD ("Delete IME(%s)", appids[0].c_str ()); if (isf_db_delete_ime_info_by_pkgid(package)) { // Delete package from ime_info db. _update_ime_info(); @@ -1493,18 +1493,18 @@ static void _package_manager_event_cb (const char *type, const char *package, pa } } else { - LOGW ("isf_db_select_appids_by_pkgid returned %d.\n", ret); + LOGW ("isf_db_select_appids_by_pkgid returned %d.", ret); } } } } else if (event_type == PACKAGE_MANAGER_EVENT_TYPE_INSTALL) { if (event_state == PACKAGE_MANAGER_EVENT_STATE_COMPLETED) { - LOGD ("type=%s package=%s event_type=INSTALL event_state=COMPLETED progress=%d error=%d\n", type, package, progress, error); + LOGD ("type=%s package=%s event_type=INSTALL event_state=COMPLETED progress=%d error=%d", type, package, progress, error); ///////////////// UNINSTALL -> INSTALL and if the uninstalled IME is reinstalled ///////////////// if (g_stopped_helper_pkgid.compare(package) == 0 && g_start_default_helper_timer) { - LOGD ("Cancel timer to start the default IME\n"); + LOGD ("Cancel timer to start the default IME"); ecore_timer_del(g_start_default_helper_timer); g_start_default_helper_timer = NULL; g_stopped_helper_pkgid = ""; @@ -1529,7 +1529,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa if (total_appids.size() > 0) _info_manager->update_ise_list (total_appids); - LOGD ("Restart IME(%s)\n", appids[0].c_str ()); + LOGD ("Restart IME(%s)", appids[0].c_str ()); scim_global_config_write (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), appids[0]); set_keyboard_engine (String (SCIM_COMPOSE_KEY_FACTORY_UUID)); _info_manager->start_helper (appids[0]); @@ -1541,7 +1541,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa } } else { - LOGW ("isf_db_select_appids_by_pkgid returned %d.\n", ret); + LOGW ("isf_db_select_appids_by_pkgid returned %d.", ret); _update_ime_info(); @@ -1554,7 +1554,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa } } else { - LOGW ("_isf_insert_ime_info_by_pkgid returned %d.\n", ret); + LOGW ("_isf_insert_ime_info_by_pkgid returned %d.", ret); } } else { // If new package is installed... @@ -1593,7 +1593,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa if (g_updated_helper_pkgid.compare(package) == 0) { for (it = _ime_info.begin(); it != _ime_info.end(); it++) { if (it->mode == TOOLBAR_HELPER_MODE && it->pkgid.compare(package) == 0) { - LOGD ("Start IME(%s)\n", it->appid.c_str ()); + LOGD ("Start IME(%s)", it->appid.c_str ()); scim_global_config_write (String (SCIM_GLOBAL_CONFIG_DEFAULT_ISE_UUID), it->appid); set_keyboard_engine (String (SCIM_COMPOSE_KEY_FACTORY_UUID)); _info_manager->start_helper (it->appid); @@ -1625,7 +1625,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa ///////////////// END ///////////////// } else if (ret == 0) { - LOGW ("_isf_insert_ime_info_by_pkgid returned %d.\n", ret); + LOGW ("_isf_insert_ime_info_by_pkgid returned %d.", ret); } } } @@ -1633,7 +1633,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa else if (event_type == PACKAGE_MANAGER_EVENT_TYPE_UNINSTALL) { switch (event_state) { case PACKAGE_MANAGER_EVENT_STATE_STARTED: - LOGD ("type=%s package=%s event_type=UNINSTALL event_state=STARTED progress=%d error=%d\n", type, package, progress, error); + LOGD ("type=%s package=%s event_type=UNINSTALL event_state=STARTED progress=%d error=%d", type, package, progress, error); { // Need to check if there is "http://tizen.org/category/ime" category; it can be done by comparing pkgid with ime_info db. int imeCnt = 0; @@ -1649,7 +1649,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa if (imeCnt > 0) { // There might be more than one appid for one pkgid, but let's assume Helper always has one appid per a pkgid. Stop Helper ISE, but not delete it from ime_info db. - LOGD ("%s for pkgid(\"%s\") is about to be deleted\n", it->appid.c_str (), package); + LOGD ("%s for pkgid(\"%s\") is about to be deleted", it->appid.c_str (), package); g_pkgids_to_be_uninstalled.push_back(std::make_pair (String(package), it->is_enabled)); if (_soft_keyboard_launched && isf_db_select_appids_by_pkgid(package, appids)) { @@ -1657,7 +1657,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa if (std::find(appids.begin(), appids.end(), current_ime_appid) != appids.end()) { // If the uninstalled IME is the current ISE... appids size is probably 1. for (it = _ime_info.begin (); it != _ime_info.end (); it++) { if (it->appid.compare(current_ime_appid) == 0 && it->mode == TOOLBAR_HELPER_MODE) { // Make sure it's Helper ISE... - LOGD ("Stop IME(%s)\n", current_ime_appid.c_str ()); + LOGD ("Stop IME(%s)", current_ime_appid.c_str ()); _info_manager->hide_helper (current_ime_appid); _info_manager->stop_helper (current_ime_appid); _soft_keyboard_launched = false; @@ -1672,7 +1672,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa break; case PACKAGE_MANAGER_EVENT_STATE_COMPLETED: - LOGD ("type=%s package=%s event_type=UNINSTALL event_state=COMPLETED progress=%d error=%d\n", type, package, progress, error); + LOGD ("type=%s package=%s event_type=UNINSTALL event_state=COMPLETED progress=%d error=%d", type, package, progress, error); for (it3 = g_pkgids_to_be_uninstalled.begin (); it3 != g_pkgids_to_be_uninstalled.end (); it3++) { if (it3->first.compare(package) == 0) { @@ -1683,13 +1683,13 @@ static void _package_manager_event_cb (const char *type, const char *package, pa if (g_stopped_helper_pkgid.compare(package) == 0) { // If the uninstalled ISE is the current ISE, start the initial helper ISE by timer. if (g_start_default_helper_timer) ecore_timer_del(g_start_default_helper_timer); - LOGD ("Add timer to start the default IME\n"); + LOGD ("Add timer to start the default IME"); g_start_default_helper_timer = ecore_timer_add(3.0, _start_default_helper_timer, NULL); } else { // Need to clean up g_pkgids_to_be_uninstalled info unless the same package is installed again; e.g., UNINSTALL -> INSTALL case. if (g_release_uninstalled_ime_info_timer) ecore_timer_del(g_release_uninstalled_ime_info_timer); - LOGD ("Add timer to release uninstalled IME pkg info\n"); + LOGD ("Add timer to release uninstalled IME pkg info"); g_release_uninstalled_ime_info_timer = ecore_timer_add(7.0, _release_uninstalled_pkginfo_timer, NULL); } @@ -1706,7 +1706,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa break; case PACKAGE_MANAGER_EVENT_STATE_FAILED: - LOGD ("type=%s package=%s event_type=UNINSTALL event_state=FAILED progress=%d error=%d\n", type, package, progress, error); + LOGD ("type=%s package=%s event_type=UNINSTALL event_state=FAILED progress=%d error=%d", type, package, progress, error); for (it3 = g_pkgids_to_be_uninstalled.begin (); it3 != g_pkgids_to_be_uninstalled.end (); it3++) { if (it3->first.compare(package) == 0) { @@ -1718,7 +1718,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa if (ret == 1 && appids.size () == 1) { for (it = _ime_info.begin (); it != _ime_info.end (); it++) { if (it->appid.compare(appids[0]) == 0 && it->mode == TOOLBAR_HELPER_MODE) { // Make sure it's Helper ISE... - LOGD ("Restart IME(%s)\n", appids[0].c_str ()); + LOGD ("Restart IME(%s)", appids[0].c_str ()); set_keyboard_engine (String (SCIM_COMPOSE_KEY_FACTORY_UUID)); _info_manager->start_helper (appids[0]); _soft_keyboard_launched = true; @@ -1727,7 +1727,7 @@ static void _package_manager_event_cb (const char *type, const char *package, pa } } else { - LOGW ("isf_db_select_appids_by_pkgid returned %d.\n", ret); + LOGW ("isf_db_select_appids_by_pkgid returned %d.", ret); } g_stopped_helper_pkgid = ""; } @@ -1793,7 +1793,7 @@ static bool set_helper_ise (const String &uuid, bool launch_ise) TOOLBAR_MODE_T mode = _info_manager->get_current_toolbar_mode (); String pre_uuid = _info_manager->get_current_helper_uuid (); - LOGD ("pre_appid=%s, appid=%s, launch_ise=%d, %d\n", pre_uuid.c_str(), uuid.c_str(), launch_ise, _soft_keyboard_launched); + LOGD ("pre_appid=%s, appid=%s, launch_ise=%d, %d", pre_uuid.c_str(), uuid.c_str(), launch_ise, _soft_keyboard_launched); if (pre_uuid == uuid && _soft_keyboard_launched) return true; @@ -1801,11 +1801,11 @@ static bool set_helper_ise (const String &uuid, bool launch_ise) _info_manager->hide_helper (pre_uuid); _info_manager->stop_helper (pre_uuid); _soft_keyboard_launched = false; - LOGD ("stop helper : %s\n", pre_uuid.c_str ()); + LOGD ("stop helper : %s", pre_uuid.c_str ()); } if (launch_ise) { - LOGD ("Start helper (%s)\n", uuid.c_str ()); + LOGD ("Start helper (%s)", uuid.c_str ()); set_keyboard_engine (String (SCIM_COMPOSE_KEY_FACTORY_UUID)); if (_info_manager->start_helper (uuid)) @@ -2009,7 +2009,7 @@ int get_ime_app_list_cb (const pkgmgrinfo_appinfo_h handle, void *user_data) static bool set_active_ise (const String &uuid, bool launch_ise) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; - LOGD ("set ISE (%s) %d\n", uuid.c_str(), launch_ise); + LOGD ("set ISE (%s) %d", uuid.c_str(), launch_ise); if (uuid.length () <= 0) return false; @@ -2024,7 +2024,7 @@ static bool set_active_ise (const String &uuid, bool launch_ise) if (ret == PMINFO_R_OK) { ret = pkgmgrinfo_appinfo_filter_count(handle, &ime_num); if (ret != PMINFO_R_OK) { - LOGW("pkgmgrinfo_appinfo_filter_count failed(%d)\n", ret); + LOGW("pkgmgrinfo_appinfo_filter_count failed(%d)", ret); } } pkgmgrinfo_appinfo_filter_destroy (handle); @@ -2083,10 +2083,10 @@ static bool set_active_ise (const String &uuid, bool launch_ise) if (valid) ise_changed = set_helper_ise (_ime_info[i].appid, launch_ise); else - LOGW ("Helper ISE(appid=\"%s\",module_name=\"%s\") is not valid.\n", _ime_info[i].appid.c_str (), _ime_info[i].module_name.c_str ()); + LOGW ("Helper ISE(appid=\"%s\",module_name=\"%s\") is not valid.", _ime_info[i].appid.c_str (), _ime_info[i].module_name.c_str ()); } else { - LOGW ("Helper ISE(appid=\"%s\") is not enabled.\n", _ime_info[i].appid.c_str ()); + LOGW ("Helper ISE(appid=\"%s\") is not enabled.", _ime_info[i].appid.c_str ()); } } _info_manager->set_current_toolbar_mode (_ime_info[i].mode); @@ -2118,14 +2118,14 @@ static bool set_active_ise (const String &uuid, bool launch_ise) #endif } else { - LOGW ("Failed to launch IME (%s)\n", uuid.c_str ()); + LOGW ("Failed to launch IME (%s)", uuid.c_str ()); } return ise_changed; } } - LOGW ("Failed to launch IME (%s)\n", uuid.c_str ()); + LOGW ("Failed to launch IME (%s)", uuid.c_str ()); return false; } @@ -2212,7 +2212,7 @@ static void ui_candidate_window_resize (int new_width, int new_height) int height; - LOGD ("%s (w: %d, h: %d)\n", __func__, new_width, new_height); + LOGD ("%s (w: %d, h: %d)", __func__, new_width, new_height); evas_object_resize (_aux_line, new_width, 2); _candidate_width = new_width; _candidate_height = new_height; @@ -2258,7 +2258,7 @@ static void ui_candidate_window_resize (int new_width, int new_height) } } - LOGD ("window_rotation_geometry_set (_candidate_window), port (%d, %d), land (%d, %d)\n", + LOGD ("window_rotation_geometry_set (_candidate_window), port (%d, %d), land (%d, %d)", port_width, port_height, land_width, land_height); #ifdef HAVE_ECOREX @@ -2561,7 +2561,7 @@ static Eina_Bool off_prepare_done_timeout (void *data) // WILL_HIDE_REQUEST_DONE Ack to WM Ecore_X_Window root_window = ecore_x_window_root_get (_control_window); //ecore_x_e_virtual_keyboard_off_prepare_done_send (root_window, _control_window); - LOGD ("_ecore_x_e_virtual_keyboard_off_prepare_done_send (%x, %x)\n", + LOGD ("_ecore_x_e_virtual_keyboard_off_prepare_done_send (%x, %x)", root_window, _control_window); _off_prepare_done_timer = NULL; @@ -2577,7 +2577,7 @@ static Eina_Bool off_prepare_done_timeout (void *data) */ static void delete_candidate_hide_timer (void) { - LOGD ("deleting candidate_hide_timer\n"); + LOGD ("deleting candidate_hide_timer"); if (_candidate_hide_timer) { ecore_timer_del (_candidate_hide_timer); _candidate_hide_timer = NULL; @@ -2591,7 +2591,7 @@ static void candidate_window_hide (void) delete_candidate_hide_timer (); _candidate_state = WINDOW_STATE_HIDE; - LOGD ("evas_object_hide (_candidate_window, %p)\n", elm_win_xwindow_get (_candidate_window)); + LOGD ("evas_object_hide (_candidate_window, %p)", elm_win_xwindow_get (_candidate_window)); if (_candidate_window) { /* There are cases that when there are rapid ISE_HIDE and ISE_SHOW requests, @@ -2619,7 +2619,7 @@ static Eina_Bool candidate_hide_timer (void *data) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; - LOGD ("calling candidate_window_hide ()\n"); + LOGD ("calling candidate_window_hide ()"); candidate_window_hide (); return ECORE_CALLBACK_CANCEL; @@ -2654,7 +2654,7 @@ static Eina_Bool x_event_window_show_cb (void *data, int ev_type, void *event) Ecore_X_Event_Window_Show *e = (Ecore_X_Event_Window_Show*)event; if (_candidate_state == WINDOW_STATE_WILL_SHOW) { if (e->win == elm_win_xwindow_get (_candidate_window)) { - LOGD ("Candidate window show callback\n"); + LOGD ("Candidate window show callback"); /* If our candidate window is in WILL_SHOW state and this show callback was called, now we are finally displayed on to the screen */ @@ -2677,7 +2677,7 @@ static Eina_Bool x_event_window_show_cb (void *data, int ev_type, void *event) } } else { if (e->win == elm_win_xwindow_get (_candidate_window)) { - LOGD ("Candidate window show callback, but _candidate_state is %d\n", _candidate_state); + LOGD ("Candidate window show callback, but _candidate_state is %d", _candidate_state); } } @@ -2704,7 +2704,7 @@ static void ui_candidate_show (bool bSetVirtualKbd) /* If the ISE is not visible currently, wait for the ISE to be opened and then show our candidate window */ _candidate_show_requested = true; if ((_info_manager->get_current_toolbar_mode () == TOOLBAR_HELPER_MODE) && (_ise_state != WINDOW_STATE_SHOW)) { - LOGD ("setting _show_candidate_requested to TRUE\n"); + LOGD ("setting _show_candidate_requested to TRUE"); return; } @@ -2734,7 +2734,7 @@ static void ui_candidate_show (bool bSetVirtualKbd) struct rectinfo info = {0, 0, 0, 0}; info.pos_y = _screen_width > _screen_height ? _screen_width : _screen_height; set_keyboard_geometry_atom_info (_app_window, info); - LOGD ("Conformant reset for window %x\n", _app_window); + LOGD ("Conformant reset for window %x", _app_window); _app_window = current_app_window; } } @@ -2763,7 +2763,7 @@ static void ui_candidate_show (bool bSetVirtualKbd) /* If we are in hardware keyboard mode, this candidate window is now considered to be a input panel */ if (_candidate_mode == FIXED_CANDIDATE_WINDOW) { if (_info_manager->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) { - LOGD ("sending ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW\n"); + LOGD ("sending ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW"); _info_manager->update_input_panel_event ((uint32)ECORE_IMF_INPUT_PANEL_STATE_EVENT, (uint32)ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW); } } @@ -2771,15 +2771,15 @@ static void ui_candidate_show (bool bSetVirtualKbd) if (_candidate_state != WINDOW_STATE_SHOW) { #ifdef HAVE_ECOREX if (_candidate_show_handler) { - LOGD ("Was still waiting for CANDIDATE_WINDOW_SHOW....\n"); + LOGD ("Was still waiting for CANDIDATE_WINDOW_SHOW...."); } else { delete_candidate_show_handler (); - LOGD ("Registering ECORE_X_EVENT_WINDOW_SHOW event, %d\n", _candidate_state); + LOGD ("Registering ECORE_X_EVENT_WINDOW_SHOW event, %d", _candidate_state); _candidate_show_handler = ecore_event_handler_add (ECORE_X_EVENT_WINDOW_SHOW, x_event_window_show_cb, NULL); } #endif } else { - LOGD ("The candidate window was already in SHOW state, update geometry information\n"); + LOGD ("The candidate window was already in SHOW state, update geometry information"); _info_manager->update_input_panel_event (ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0); _info_manager->update_input_panel_event (ECORE_IMF_CANDIDATE_PANEL_GEOMETRY_EVENT, 0); @@ -2823,7 +2823,7 @@ static void ui_candidate_hide (bool bForce, bool bSetVirtualKbd, bool will_hide) if (bForce || ui_candidate_can_be_hide ()) { if (will_hide) { - LOGD ("candidate_state = WILL_HIDE\n"); + LOGD ("candidate_state = WILL_HIDE"); _candidate_state = WINDOW_STATE_WILL_HIDE; delete_candidate_hide_timer (); @@ -2891,7 +2891,7 @@ static void ui_candidate_window_more_button_cb (void *data, Evas *e, Evas_Object if (_candidate_angle == 180) { Ecore_Evas *ee = ecore_evas_ecore_evas_get (evas_object_evas_get (_candidate_window)); ecore_evas_move_resize (ee, 0, 0, 0, 0); - LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)\n", ee, 0, 0, 0, 0); + LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)", ee, 0, 0, 0, 0); } else if (_candidate_mode == FIXED_CANDIDATE_WINDOW && _candidate_angle == 270) { /* * when screen rotate 270 degrees, candidate have to move then resize for expanding more @@ -2900,7 +2900,7 @@ static void ui_candidate_window_more_button_cb (void *data, Evas *e, Evas_Object */ Ecore_Evas *ee = ecore_evas_ecore_evas_get (evas_object_evas_get (_candidate_window)); ecore_evas_move_resize (ee, 0, 0, _screen_height, ui_candidate_get_valid_height () + _ise_height); - LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)\n", + LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)", ee, 0, 0, _screen_height, ui_candidate_get_valid_height () + _ise_height); } @@ -2946,7 +2946,7 @@ static void ui_candidate_window_close_button_cb (void *data, Evas *e, Evas_Objec if (_candidate_angle == 180) { Ecore_Evas *ee= ecore_evas_ecore_evas_get (evas_object_evas_get (_candidate_window)); ecore_evas_move_resize (ee, 0, 0, 0, 0); - LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)\n", ee, 0, 0, 0, 0); + LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)", ee, 0, 0, 0, 0); } else if (_candidate_mode == FIXED_CANDIDATE_WINDOW && _candidate_angle == 270) { /* * when screen rotate 270 degrees, candidate have to move then resize for expanding more @@ -2955,7 +2955,7 @@ static void ui_candidate_window_close_button_cb (void *data, Evas *e, Evas_Objec */ Ecore_Evas *ee = ecore_evas_ecore_evas_get (evas_object_evas_get (_candidate_window)); ecore_evas_move_resize (ee, _ise_height, 0, _screen_height, ui_candidate_get_valid_height ()); - LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)\n", + LOGD ("ecore_evas_move_resize (%p, %d, %d, %d, %d)", ee, _ise_height, 0, _screen_height, ui_candidate_get_valid_height ()); } @@ -2997,9 +2997,9 @@ static void ui_mouse_button_pressed_cb (void *data, Evas *e, Evas_Object *button feedback_result = feedback_play_type (FEEDBACK_TYPE_SOUND, FEEDBACK_PATTERN_SIP); if (FEEDBACK_ERROR_NONE == feedback_result) - LOGD ("Sound play successful\n"); + LOGD ("Sound play successful"); else - LOGW ("Cannot play feedback sound : %d\n", feedback_result); + LOGW ("Cannot play feedback sound : %d", feedback_result); } bool vibrate_feedback = _config->read (SCIM_GLOBAL_CONFIG_PANEL_VIBRATION_FEEDBACK, false); @@ -3008,9 +3008,9 @@ static void ui_mouse_button_pressed_cb (void *data, Evas *e, Evas_Object *button feedback_result = feedback_play_type (FEEDBACK_TYPE_VIBRATION, FEEDBACK_PATTERN_SIP); if (FEEDBACK_ERROR_NONE == feedback_result) - LOGD ("Vibration play successful\n"); + LOGD ("Vibration play successful"); else - LOGW ("Cannot play feedback vibration : %d\n", feedback_result); + LOGW ("Cannot play feedback vibration : %d", feedback_result); } } #endif @@ -3103,26 +3103,26 @@ static bool ui_open_tts (void) int r = tts_create (&_tts); if (TTS_ERROR_NONE != r) { - LOGW ("tts_create FAILED : result (%d)\n", r); + LOGW ("tts_create FAILED : result (%d)", r); _tts = NULL; return false; } r = tts_set_mode (_tts, TTS_MODE_SCREEN_READER); if (TTS_ERROR_NONE != r) { - LOGW ("tts_set_mode FAILED : result (%d)\n", r); + LOGW ("tts_set_mode FAILED : result (%d)", r); } tts_state_e current_state; r = tts_get_state (_tts, ¤t_state); if (TTS_ERROR_NONE != r) { - LOGW ("tts_get_state FAILED : result (%d)\n", r); + LOGW ("tts_get_state FAILED : result (%d)", r); } if (TTS_STATE_CREATED == current_state) { r = tts_prepare (_tts); if (TTS_ERROR_NONE != r) { - LOGW ("tts_prepare FAILED : ret (%d)\n", r); + LOGW ("tts_prepare FAILED : ret (%d)", r); } } return true; @@ -3138,12 +3138,12 @@ static void ui_close_tts (void) if (_tts) { int r = tts_unprepare (_tts); if (TTS_ERROR_NONE != r) { - LOGW ("tts_unprepare FAILED : result (%d)\n", r); + LOGW ("tts_unprepare FAILED : result (%d)", r); } r = tts_destroy (_tts); if (TTS_ERROR_NONE != r) { - LOGW ("tts_destroy FAILED : result (%d)\n", r); + LOGW ("tts_destroy FAILED : result (%d)", r); } } } @@ -3170,13 +3170,13 @@ static void ui_play_tts (const char* str) r = tts_get_state (_tts, ¤t_state); if (TTS_ERROR_NONE != r) { - LOGW ("Fail to get state from TTS : ret (%d)\n", r); + LOGW ("Fail to get state from TTS : ret (%d)", r); } if (TTS_STATE_PLAYING == current_state) { r = tts_stop (_tts); if (TTS_ERROR_NONE != r) { - LOGW ("Fail to stop TTS : ret (%d)\n", r); + LOGW ("Fail to stop TTS : ret (%d)", r); } } @@ -3191,13 +3191,13 @@ static void ui_play_tts (const char* str) language = ise_langs[0]; } } - LOGD ("TTS language:%s, str:%s\n", language.c_str (), str); + LOGD ("TTS language:%s, str:%s", language.c_str (), str); r = tts_add_text (_tts, str, language.c_str (), TTS_VOICE_TYPE_AUTO, TTS_SPEED_AUTO, &utt_id); if (TTS_ERROR_NONE == r) { r = tts_play (_tts); if (TTS_ERROR_NONE != r) { - LOGW ("Fail to play TTS : ret (%d)\n", r); + LOGW ("Fail to play TTS : ret (%d)", r); } } } @@ -3649,7 +3649,7 @@ static void ui_destroy_candidate_window (void) _aux_seperates.clear (); /* Delete candidate window */ if (_candidate_window) { - LOGD ("calling ui_candidate_hide (true)\n"); + LOGD ("calling ui_candidate_hide (true)"); ui_candidate_hide (true); evas_object_del (_candidate_window); @@ -3844,7 +3844,7 @@ static void ui_settle_candidate_window (void) _candidate_x = spot_x; _candidate_y = spot_y; evas_object_move (_candidate_window, spot_x, spot_y); - LOGD ("Moving candidate window to : %d %d\n", spot_x, spot_y); + LOGD ("Moving candidate window to : %d %d", spot_x, spot_y); if (_preedit_window) { if (_candidate_angle == 90) { spot_x -= _preedit_height; @@ -3878,7 +3878,7 @@ static void set_soft_candidate_geometry (int x, int y, int width, int height) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " x:" << x << " y:" << y << " width:" << width << " height:" << height << "...\n"; - LOGD ("candidate geometry x: %d , y: %d , width: %d , height: %d, _ise_state: %d, candidate_mode: %d\n", x, y, width, height, _ise_state, _candidate_mode); + LOGD ("candidate geometry x: %d , y: %d , width: %d , height: %d, _ise_state: %d, candidate_mode: %d", x, y, width, height, _ise_state, _candidate_mode); if ((_candidate_mode != SOFT_CANDIDATE_WINDOW) || (_info_manager->get_current_toolbar_mode () != TOOLBAR_KEYBOARD_MODE)) return; @@ -3909,7 +3909,7 @@ static void efl_set_transient_for_app_window (Ecore_X_Window window) Ecore_X_Window xAppWindow = efl_get_app_window (); ecore_x_icccm_transient_for_set (window, xAppWindow); - LOGD ("win : %x, forwin : %x\n", window, xAppWindow); + LOGD ("win : %x, forwin : %x", window, xAppWindow); } static int efl_get_window_rotate_angle (Ecore_X_Window win) @@ -3925,10 +3925,10 @@ static int efl_get_window_rotate_angle (Ecore_X_Window win) ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE, ECORE_X_ATOM_CARDINAL, 32, &prop_data, &count); if (ret && prop_data) { memcpy (&angle, prop_data, sizeof (int)); - LOGD ("WINDOW angle of %p is %d\n", win, angle); + LOGD ("WINDOW angle of %p is %d", win, angle); } else { std::cerr << "ecore_x_window_prop_property_get () is failed!!!\n"; - LOGW ("WINDOW angle of %p FAILED!\n", win); + LOGW ("WINDOW angle of %p FAILED!", win); } if (prop_data) XFree (prop_data); @@ -4244,12 +4244,12 @@ static bool initialize_panel_agent (const ConfigPointer& config, const String &d { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; - LOGD ("initializing panel agent\n"); + LOGD ("initializing panel agent"); _info_manager = new InfoManager (); if (!_info_manager || !_info_manager->initialize (_info_manager, config, display, resident)) { - ISF_SAVE_LOG ("panel_agent initialize fail!\n"); + ISF_SAVE_LOG ("panel_agent initialize fail!"); return false; } @@ -4319,14 +4319,14 @@ static bool initialize_panel_agent (const ConfigPointer& config, const String &d _info_manager->signal_connect_run_helper (slot (slot_run_helper)); _info_manager->signal_connect_launch_option_application (slot (slot_launch_option_application)); - LOGD ("initializing panel agent succeeded\n"); + LOGD ("initializing panel agent succeeded"); return true; } static void delete_ise_hide_timer (void) { - LOGD ("deleting ise_hide_timer\n"); + LOGD ("deleting ise_hide_timer"); if (_ise_hide_timer) { ecore_timer_del (_ise_hide_timer); _ise_hide_timer = NULL; @@ -4335,7 +4335,7 @@ static void delete_ise_hide_timer (void) static void hide_ise () { - LOGD ("send request to hide helper\n"); + LOGD ("send request to hide helper"); String uuid = _info_manager->get_current_helper_uuid (); _info_manager->hide_helper (uuid); @@ -4430,7 +4430,7 @@ static bool update_ise_list (std::vector &list) if (set_active_ise (active_uuid, _soft_keyboard_launched) == false) { if (_initial_ise_uuid.compare (active_uuid)) { - LOGD ("Trying to launch initial IME (%s)\n", _initial_ise_uuid.c_str ()); + LOGD ("Trying to launch initial IME (%s)", _initial_ise_uuid.c_str ()); set_active_ise (_initial_ise_uuid, _soft_keyboard_launched); } } @@ -4456,7 +4456,7 @@ static bool update_ise_list (std::vector &list) #endif } else - LOGW ("No IME list\n"); + LOGW ("No IME list"); #ifdef HAVE_PKGMGR_INFO if (!pkgmgr) { @@ -4464,14 +4464,14 @@ static bool update_ise_list (std::vector &list) if (ret == PACKAGE_MANAGER_ERROR_NONE) { ret = package_manager_set_event_cb (pkgmgr, _package_manager_event_cb, NULL); if (ret == PACKAGE_MANAGER_ERROR_NONE) { - LOGD ("package_manager_set_event_cb succeeded.\n"); + LOGD ("package_manager_set_event_cb succeeded."); } else { - LOGE ("package_manager_set_event_cb failed(%d)\n", ret); + LOGE ("package_manager_set_event_cb failed(%d)", ret); } } else { - LOGE ("package_manager_create failed(%d)\n", ret); + LOGE ("package_manager_create failed(%d)", ret); } } #endif @@ -4491,7 +4491,7 @@ static void slot_focus_in (void) if (_launch_ise_on_request && !_soft_keyboard_launched) { String uuid = _config->read (SCIM_CONFIG_DEFAULT_HELPER_ISE, String ("")); if (uuid.length () > 0 && (_ime_info[get_ise_index(uuid)].options & ISM_HELPER_PROCESS_KEYBOARD_KEYEVENT)) { - LOGD ("Start helper (%s)\n", uuid.c_str ()); + LOGD ("Start helper (%s)", uuid.c_str ()); set_keyboard_engine (String (SCIM_COMPOSE_KEY_FACTORY_UUID)); if (_info_manager->start_helper (uuid)) @@ -4631,7 +4631,7 @@ static void slot_update_factory_info (const PanelFactoryInfo &info) char noti_msg[256] = {0}; unsigned int keyboard_ise_count = get_ise_count (TOOLBAR_KEYBOARD_MODE, false); if (keyboard_ise_count == 0) { - LOGD ("the number of keyboard ise is %d\n", keyboard_ise_count); + LOGD ("the number of keyboard ise is %d", keyboard_ise_count); return; } else if (keyboard_ise_count >= 2) { @@ -4642,7 +4642,7 @@ static void slot_update_factory_info (const PanelFactoryInfo &info) } notification_status_message_post (noti_msg); - LOGD ("%s\n", noti_msg); + LOGD ("%s", noti_msg); } } } @@ -4693,7 +4693,7 @@ static void slot_update_ise_geometry (int x, int y, int width, int height) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " x:" << x << " y:" << y << " width:" << width << " height:" << height << "...\n"; - LOGD ("x : %d , y : %d , width : %d , height : %d, _ise_state : %d\n", x, y, width, height, _ise_state); + LOGD ("x : %d , y : %d , width : %d , height : %d, _ise_state : %d", x, y, width, height, _ise_state); if (_info_manager->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) { if (_candidate_mode == SOFT_CANDIDATE_WINDOW) { @@ -4799,7 +4799,7 @@ static void slot_show_aux_string (void) _aux_area_visible = true; ui_candidate_window_adjust (); - LOGD ("calling ui_candidate_show ()\n"); + LOGD ("calling ui_candidate_show ()"); ui_candidate_show (); ui_settle_candidate_window (); ui_candidate_delete_destroy_timer (); @@ -4833,7 +4833,7 @@ static void slot_show_candidate_table (void) _candidate_area_1_visible = true; ui_candidate_window_adjust (); - LOGD ("calling ui_candidate_show ()\n"); + LOGD ("calling ui_candidate_show ()"); ui_candidate_show (); ui_settle_candidate_window (); ui_candidate_delete_destroy_timer (); @@ -4842,10 +4842,10 @@ static void slot_show_candidate_table (void) int feedback_result = feedback_initialize (); if (FEEDBACK_ERROR_NONE == feedback_result) { - LOGD ("Feedback initialize successful\n"); + LOGD ("Feedback initialize successful"); feedback_initialized = true; } else { - LOGW ("Feedback initialize fail : %d\n", feedback_result); + LOGW ("Feedback initialize fail : %d", feedback_result); feedback_initialized = false; } #endif /* HAVE_FEEDBACK */ @@ -4883,13 +4883,13 @@ static void slot_hide_aux_string (void) elm_scroller_region_show (_aux_area, 0, 0, 10, 10); ui_candidate_window_adjust (); - LOGD ("calling ui_candidate_hide (false, true, true)\n"); + LOGD ("calling ui_candidate_hide (false, true, true)"); ui_candidate_hide (false, true, true); ui_settle_candidate_window (); if (ui_candidate_can_be_hide ()) { _candidate_show_requested = false; - LOGD ("setting _show_candidate_requested to FALSE\n"); + LOGD ("setting _show_candidate_requested to FALSE"); } #endif /* CANDIDATE */ } @@ -4934,7 +4934,7 @@ static void slot_hide_candidate_table (void) } ui_candidate_window_adjust (); - LOGD ("calling ui_candidate_hide (%d, true, true)\n", bForce); + LOGD ("calling ui_candidate_hide (%d, true, true)", bForce); ui_candidate_hide (bForce, true, true); ui_settle_candidate_window (); } @@ -4943,16 +4943,16 @@ static void slot_hide_candidate_table (void) int feedback_result = feedback_deinitialize (); if (FEEDBACK_ERROR_NONE == feedback_result) - LOGD ("Feedback deinitialize successful\n"); + LOGD ("Feedback deinitialize successful"); else - LOGW ("Feedback deinitialize fail : %d\n", feedback_result); + LOGW ("Feedback deinitialize fail : %d", feedback_result); feedback_initialized = false; #endif if (ui_candidate_can_be_hide ()) { _candidate_show_requested = false; - LOGD ("setting _show_candidate_requested to FALSE\n"); + LOGD ("setting _show_candidate_requested to FALSE"); } #endif /* CANDIDATE */ } @@ -5061,7 +5061,7 @@ static void slot_update_aux_string (const String &str, const AttributeList &attr return; if (!_aux_area_visible) { - LOGD ("calling ui_candidate_show ()\n"); + LOGD ("calling ui_candidate_show ()"); ui_candidate_show (); slot_show_aux_string (); } @@ -5511,7 +5511,7 @@ static void slot_get_candidate_geometry (struct rectinfo &info) info.width = width; info.height = height; - LOGD ("%d %d %d %d\n", info.pos_x, info.pos_y, info.width, info.height); + LOGD ("%d %d %d %d", info.pos_x, info.pos_y, info.width, info.height); SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " x:" << info.pos_x << " y:" << info.pos_y << " width:" << info.width << " height:" << info.height << "\n"; } @@ -5566,7 +5566,7 @@ static void slot_get_input_panel_geometry (struct rectinfo &info) #endif /* CANDIDATE */ } - LOGD ("%d %d %d %d\n", info.pos_x, info.pos_y, info.width, info.height); + LOGD ("%d %d %d %d", info.pos_x, info.pos_y, info.width, info.height); SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " x:" << info.pos_x << " y:" << info.pos_y << " width:" << info.width << " height:" << info.height << "\n"; } @@ -5579,7 +5579,7 @@ static void slot_get_input_panel_geometry (struct rectinfo &info) */ static void slot_get_recent_ise_geometry (int angle, struct rectinfo &info) { - LOGD ("slot_get_recent_ise_geometry\n"); + LOGD ("slot_get_recent_ise_geometry"); /* If we have geometry reported by ISE, use the geometry information */ if (angle < 0) { @@ -5612,9 +5612,9 @@ static bool slot_check_privilege_by_sockfd (int client_id, String privilege) bool priv_ret = privilegeChecker.checkPrivilege (privilege.c_str ()); if (priv_ret == false) - LOGW ("Failed to check privilege (%s)\n", privilege.c_str ()); + LOGW ("Failed to check privilege (%s)", privilege.c_str ()); else - LOGD ("Succeeded to check privilege (%s)\n", privilege.c_str ()); + LOGD ("Succeeded to check privilege (%s)", privilege.c_str ()); return priv_ret; } @@ -5638,7 +5638,7 @@ static void slot_set_active_ise (const String &uuid, bool changeDefault) /* Try to get in global packages */ int ret = pkgmgr_get_appinfo (uuid.c_str (), &handle); if (ret != PMINFO_R_OK) { - LOGW ("appid \"%s\" is invalid.\n", uuid.c_str ()); + LOGW ("appid \"%s\" is invalid.", uuid.c_str ()); /* This might happen if IME is uninstalled while the panel process is inactive. The variable uuid would be invalid, so set_active_ise() would return false. */ invalid = true; @@ -5737,7 +5737,7 @@ static bool slot_get_all_helper_ise_info (HELPER_ISE_INFO &info) static void slot_set_has_option_helper_ise_info (const String &appid, bool has_option) { if (appid.length() == 0) { - LOGW ("Invalid appid\n"); + LOGW ("Invalid appid"); return; } @@ -5762,7 +5762,7 @@ static void slot_set_has_option_helper_ise_info (const String &appid, bool has_o static void slot_set_enable_helper_ise_info (const String &appid, bool is_enabled) { if (appid.length() == 0) { - LOGW ("Invalid appid\n"); + LOGW ("Invalid appid"); return; } @@ -5797,11 +5797,11 @@ static int _find_appid_from_category (const pkgmgrinfo_appinfo_h handle, void *u *result = strdup (appid); } else { - LOGW ("pkgmgrinfo_appinfo_get_appid failed!\n"); + LOGW ("pkgmgrinfo_appinfo_get_appid failed!"); } } else { - LOGW ("user_data is null!\n"); + LOGW ("user_data is null!"); } return -1; // This callback is no longer called. @@ -5841,7 +5841,7 @@ static void slot_show_helper_ise_list (void) free(app_id); } else { - SECURE_LOGW ("AppID with http://tizen.org/category/ime-list category is not available.\n"); + SECURE_LOGW ("AppID with http://tizen.org/category/ime-list category is not available."); } } @@ -5878,7 +5878,7 @@ static void slot_show_helper_ise_selector (void) free(app_id); } else { - SECURE_LOGW ("AppID with http://tizen.org/category/ime-selector category is not available.\n"); + SECURE_LOGW ("AppID with http://tizen.org/category/ime-selector category is not available."); } } @@ -5887,7 +5887,7 @@ static bool slot_is_helper_ise_enabled (String appid, int &enabled) bool is_enabled = false; if (appid.length() == 0) { - LOGW ("Invalid appid.\n"); + LOGW ("Invalid appid."); return false; } @@ -6122,7 +6122,7 @@ static void slot_close_connection (int fd) static void slot_exit (void) { std::cerr << __FUNCTION__ << "...\n"; - ISF_SAVE_LOG ("exit\n"); + ISF_SAVE_LOG ("exit"); #if ISF_BUILD_CANDIDATE_UI elm_exit (); @@ -6133,7 +6133,7 @@ static void slot_exit (void) static void delete_ise_check_pid_alive_timer(void) { - LOGD("deleting ise_check_alive_timer\n"); + LOGD("deleting ise_check_alive_timer"); if (_ise_check_pid_alive_timer) { ecore_timer_del(_ise_check_pid_alive_timer); _ise_check_pid_alive_timer = NULL; @@ -6185,7 +6185,7 @@ static void slot_register_helper_properties (int id, const PropertyList &props) if (prop.get_label ().compare ("XID") == 0) { Ecore_X_Window xwindow = atoi (prop.get_key ().c_str ()); _ise_window = xwindow; - LOGD ("ISE XID : %x\n", _ise_window); + LOGD ("ISE XID : %x", _ise_window); /* Just in case for the helper sent this message later than show_ise request */ if (_ise_state == WINDOW_STATE_SHOW || _ise_state == WINDOW_STATE_WILL_SHOW) { @@ -6238,12 +6238,12 @@ static void slot_show_ise (void) /* If the current toolbar mode is not HELPER_MODE, do not proceed */ if (_info_manager->get_current_toolbar_mode () != TOOLBAR_HELPER_MODE) { - LOGD ("Current toolbar mode should be TOOLBAR_HELPER_MODE but is %d, returning\n", + LOGD ("Current toolbar mode should be TOOLBAR_HELPER_MODE but is %d, returning", _info_manager->get_current_toolbar_mode ()); return; } - LOGD ("slot_show_ise ()\n"); + LOGD ("slot_show_ise ()"); delete_ise_hide_timer (); #ifdef HAVE_ECOREX @@ -6255,7 +6255,7 @@ static void slot_show_ise (void) info.pos_y = _screen_width > _screen_height ? _screen_width : _screen_height; set_keyboard_geometry_atom_info (_app_window, info); ecore_x_event_mask_unset (_app_window, ECORE_X_EVENT_MASK_WINDOW_FOCUS_CHANGE); - LOGD ("Conformant reset for window %x\n", _app_window); + LOGD ("Conformant reset for window %x", _app_window); _app_window = current_app_window; /* If the target window has changed but our ISE is still in visible state, @@ -6310,7 +6310,7 @@ static void slot_hide_ise (void) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; - LOGD ("slot_hide_ise ()\n"); + LOGD ("slot_hide_ise ()"); if (!_ise_hide_timer) hide_ise (); @@ -6324,10 +6324,10 @@ static void slot_will_hide_ack (void) // WILL_HIDE_REQUEST_DONE Ack to WM Ecore_X_Window root_window = ecore_x_window_root_get (_control_window); //ecore_x_e_virtual_keyboard_off_prepare_done_send (root_window, _control_window); - LOGD ("_ecore_x_e_virtual_keyboard_off_prepare_done_send (%x, %x)\n", + LOGD ("_ecore_x_e_virtual_keyboard_off_prepare_done_send (%x, %x)", root_window, _control_window); if (_info_manager->get_current_toolbar_mode () == TOOLBAR_HELPER_MODE) { - LOGD ("calling ui_candidate_hide (true, false)\n"); + LOGD ("calling ui_candidate_hide (true, false)"); ui_candidate_hide (true, false); } @@ -6348,7 +6348,7 @@ static void slot_candidate_will_hide_ack (void) { SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; #ifdef HAVE_ECOREX - LOGD ("candidate_will_hide_ack\n"); + LOGD ("candidate_will_hide_ack"); if (_candidate_state == WINDOW_STATE_WILL_HIDE) { candidate_window_hide (); } @@ -6357,7 +6357,7 @@ static void slot_candidate_will_hide_ack (void) static void slot_set_keyboard_mode (int mode) { - LOGD ("slot_set_keyboard_mode called (TOOLBAR_MODE : %d)\n", mode); + LOGD ("slot_set_keyboard_mode called (TOOLBAR_MODE : %d)", mode); change_keyboard_mode ((TOOLBAR_MODE_T)mode); } @@ -6386,7 +6386,7 @@ static void slot_get_ise_state (int &state) state = ECORE_IMF_INPUT_PANEL_STATE_HIDE; }; } - LOGD ("state = %d\n", state); + LOGD ("state = %d", state); SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " state = " << state << "\n"; } @@ -6397,13 +6397,13 @@ static void slot_start_default_ise (void) 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 ()); + LOGD ("Start helper (%s)", uuid.c_str ()); set_keyboard_engine (String (SCIM_COMPOSE_KEY_FACTORY_UUID)); if (_info_manager->start_helper (uuid)) _soft_keyboard_launched = true; else - LOGW ("Failed to start helper (%s)\n", uuid.c_str ()); + LOGW ("Failed to start helper (%s)", uuid.c_str ()); } } } @@ -6419,7 +6419,7 @@ static void slot_stop_default_ise (void) _info_manager->hide_helper (uuid); _info_manager->stop_helper (uuid); _soft_keyboard_launched = false; - LOGD ("stop helper (%s)\n", uuid.c_str ()); + LOGD ("stop helper (%s)", uuid.c_str ()); } } } @@ -6442,13 +6442,13 @@ static void launch_helper (const char* exec, const char *name, const char *appid 0}; SCIM_DEBUG_MAIN (2) << " Call scim-helper-launcher.\n"; - ISF_SAVE_LOG ("Exec scim_helper_launcher(%s %s)\n", name, appid); + ISF_SAVE_LOG ("Exec scim_helper_launcher(%s %s)", name, appid); unsetenv ("ELM_THEME"); unsetenv ("ELM_SCALE"); setsid (); - LOGD ("launch execpath : %s\n", exec); + LOGD ("launch execpath : %s", exec); execv (exec, const_cast(argv)); #if ISF_BUILD_CANDIDATE_UI elm_exit (); @@ -6465,20 +6465,20 @@ static bool app_control_launch (const char *app_id) ret = app_control_create (&app_control); if (ret != APP_CONTROL_ERROR_NONE) { - LOGW ("app_control_create returned %08x\n", ret); + LOGW ("app_control_create returned %08x", ret); return false; } ret = app_control_set_operation (app_control, APP_CONTROL_OPERATION_DEFAULT); if (ret != APP_CONTROL_ERROR_NONE) { - LOGW ("app_control_set_operation returned %08x\n", ret); + LOGW ("app_control_set_operation returned %08x", ret); app_control_destroy (app_control); return false; } ret = app_control_set_app_id (app_control, app_id); if (ret != APP_CONTROL_ERROR_NONE) { - LOGW ("app_control_set_app_id returned %08x\n", ret); + LOGW ("app_control_set_app_id returned %08x", ret); app_control_destroy (app_control); return false; } @@ -6487,15 +6487,15 @@ static bool app_control_launch (const char *app_id) do { if (tries != 0) usleep(1000000); /* If we are retrying to launch, pause for a while */ ret = app_control_send_launch_request(app_control, NULL, NULL); - LOGW ("app_control_send_launch_request returned %08x, app_id=%s\n", ret, app_id); + LOGW ("app_control_send_launch_request returned %08x, app_id=%s", ret, app_id); } while (ret != APP_CONTROL_ERROR_NONE && (++tries) < 3); app_control_destroy (app_control); if (ret != APP_CONTROL_ERROR_NONE) { - LOGW ("Failed to launch IME (%s)\n", app_id); + LOGW ("Failed to launch IME (%s)", app_id); } else { - LOGD ("Succeeded to launch IME (%s)\n", app_id); + LOGD ("Succeeded to launch IME (%s)", app_id); } return (ret == APP_CONTROL_ERROR_NONE); @@ -6503,7 +6503,7 @@ static bool app_control_launch (const char *app_id) static void slot_run_helper (const String &uuid, const String &config, const String &display) { - ISF_SAVE_LOG ("time:%ld pid:%d %s %s uuid(%s)\n", + ISF_SAVE_LOG ("time:%ld pid:%d %s %s uuid(%s)", time (0), getpid (), __FILE__, __func__, uuid.c_str ()); String scim_helper_path; @@ -6519,7 +6519,7 @@ static void slot_run_helper (const String &uuid, const String &config, const Str /* Try to get in global packages */ ret = pkgmgr_get_appinfo (uuid.c_str (), &appinfo_handle); if (ret != PMINFO_R_OK) { - LOGW ("pkgmgrinfo_appinfo_get_appinfo () & get_usr_appinfo () failed. appid : %s, ret : %d \n", uuid.c_str (), ret); + LOGW ("pkgmgrinfo_appinfo_get_appinfo () & get_usr_appinfo () failed. appid : %s, ret : %d ", uuid.c_str (), ret); return; } @@ -6530,7 +6530,7 @@ static void slot_run_helper (const String &uuid, const String &config, const Str return; } - LOGD ("exec path : %s\n", execpath); + LOGD ("exec path : %s", execpath); scim_helper_path = String (execpath); if (appinfo_handle) { @@ -6559,7 +6559,7 @@ static void slot_run_helper (const String &uuid, const String &config, const Str } } /* execute type IME */ - LOGD ("Try to launch IME (%s)\n", uuid.c_str ()); + LOGD ("Try to launch IME (%s)", uuid.c_str ()); bool launched = app_control_launch (uuid.c_str ()); if (launched) { @@ -6588,7 +6588,7 @@ static bool slot_launch_option_application (String ime_appid) { String ime_setting_app = isf_pkg_get_setting_app (ime_appid); - LOGD ("IME appid : %s, IME setting app id : %s\n", ime_appid.c_str (), ime_setting_app.c_str ()); + LOGD ("IME appid : %s, IME setting app id : %s", ime_appid.c_str (), ime_setting_app.c_str ()); if (ime_setting_app.length () > 0) { app_control_launch (ime_setting_app.c_str ()); @@ -6611,7 +6611,7 @@ static bool slot_launch_option_application (String ime_appid) static void signalhandler (int sig) { std::cerr << __FUNCTION__ << " Signal=" << sig << "\n"; - ISF_SAVE_LOG ("Signal=%d\n", sig); + ISF_SAVE_LOG ("Signal=%d", sig); #if ISF_BUILD_CANDIDATE_UI elm_exit (); @@ -6642,7 +6642,7 @@ static void update_ise_locale (const char *language) } } - LOGD ("update all ISE names according to display language : %s\n", strLang.c_str ()); + LOGD ("update all ISE names according to display language : %s", strLang.c_str ()); set_language_and_locale (strLang.c_str ()); bool need_to_init_db = false; @@ -6705,7 +6705,7 @@ static void set_language_and_locale (const char *lang_str) char language[256]; if (lang_str) { - LOGD ("language : %s\n", lang_str); + LOGD ("language : %s", lang_str); #if ISF_BUILD_CANDIDATE_UI elm_language_set (lang_str); #endif /* CANDIDATE */ @@ -6733,7 +6733,7 @@ static void display_language_changed_cb (keynode_t *key, void* data) SCIM_DEBUG_MAIN (3) << __FUNCTION__ << "...\n"; char *lang_str = vconf_keynode_get_str (key); - LOGD ("lang : %s\n", lang_str); + LOGD ("lang : %s", lang_str); set_language_and_locale (lang_str); /* Update all ISE names according to display language */ @@ -6797,11 +6797,11 @@ static void change_keyboard_mode (TOOLBAR_MODE_T mode) if (mode == TOOLBAR_KEYBOARD_MODE && _support_hw_keyboard_mode) { if (_info_manager->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) { - LOGD ("HARDWARE_KEYBOARD_MODE return\n"); + LOGD ("HARDWARE_KEYBOARD_MODE return"); return; } - LOGD ("HARDWARE KEYBOARD MODE\n"); + LOGD ("HARDWARE KEYBOARD MODE"); _config->write (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 1); _config->flush (); @@ -6858,7 +6858,7 @@ static void change_keyboard_mode (TOOLBAR_MODE_T mode) /* Read configuations for notification app (isf-kbd-mode-changer) */ String kbd_mode_changer = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_DEFAULT_KBD_MODE_CHANGER_PROGRAM), String ("")); hwkbd_module_noti.launch_app = kbd_mode_changer; - LOGD ("Create kbd_mode_changer notification with : %s\n", kbd_mode_changer.c_str ()); + LOGD ("Create kbd_mode_changer notification with : %s", kbd_mode_changer.c_str ()); create_notification (&hwkbd_module_noti); } #endif @@ -6868,16 +6868,16 @@ static void change_keyboard_mode (TOOLBAR_MODE_T mode) if (!input_detect) { if (vconf_set_bool (VCONFKEY_ISF_HW_KEYBOARD_INPUT_DETECTED, 1) != 0) - LOGW ("Failed to set vconf key\n"); + LOGW ("Failed to set vconf key"); else - LOGD ("Succeeded to set vconf key\n"); + LOGD ("Succeeded to set vconf key"); } #endif } else if (mode == TOOLBAR_HELPER_MODE) { - LOGD ("SOFTWARE KEYBOARD MODE\n"); + LOGD ("SOFTWARE KEYBOARD MODE"); /* When switching back to S/W keyboard mode, let's hide candidate window first */ #if ISF_BUILD_CANDIDATE_UI - LOGD ("calling ui_candidate_hide (true, true, true)\n"); + LOGD ("calling ui_candidate_hide (true, true, true)"); ui_candidate_hide (true, true, true); #endif /* CANDIDATE */ _config->write (ISF_CONFIG_HARDWARE_KEYBOARD_DETECT, 0); @@ -6893,7 +6893,7 @@ static void change_keyboard_mode (TOOLBAR_MODE_T mode) else { if (set_active_ise (uuid, true) == false) { if (_initial_ise_uuid.compare(uuid)) { - LOGD ("Trying to launch initial IME (%s)\n", _initial_ise_uuid.c_str ()); + LOGD ("Trying to launch initial IME (%s)", _initial_ise_uuid.c_str ()); set_active_ise (_initial_ise_uuid, true); } } @@ -6909,9 +6909,9 @@ static void change_keyboard_mode (TOOLBAR_MODE_T mode) if (input_detect) { if (vconf_set_bool (VCONFKEY_ISF_HW_KEYBOARD_INPUT_DETECTED, 0) != 0) - LOGW ("Failed to set vconf key\n"); + LOGW ("Failed to set vconf key"); else - LOGD ("Succeeded to set vconf key\n"); + LOGD ("Succeeded to set vconf key"); } #endif } @@ -6932,7 +6932,7 @@ static void change_keyboard_mode (TOOLBAR_MODE_T mode) static void _bt_cb_hid_state_changed (int result, bool connected, const char *remote_address, void *user_data) { if (connected == false) { - LOGD ("Bluetooth keyboard disconnected\n"); + LOGD ("Bluetooth keyboard disconnected"); if (_info_manager->get_current_toolbar_mode () == TOOLBAR_KEYBOARD_MODE) { change_keyboard_mode (TOOLBAR_HELPER_MODE); } @@ -6954,7 +6954,7 @@ static void show_ime_selector_notification () String noti_icon_path = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_QUICK_PANEL_ICON_PATH), String (SCIM_ICONDIR)); noti_icon_path += ISF_ISE_SELECTOR_ICON_FILE; - LOGD("IME selector icon path : %s\n", noti_icon_path.c_str ()); + LOGD("IME selector icon path : %s", noti_icon_path.c_str ()); ise_selector_module_noti.icon = noti_icon_path.c_str (); ise_selector_module_noti.content = ise_name.c_str (); @@ -6981,11 +6981,11 @@ static void show_ime_selector_notification () if (ime_selector_app.length () > 0) { ise_selector_module_noti.launch_app = ime_selector_app; - LOGD ("Create ise_selector notification with : %s\n", ime_selector_app.c_str ()); + LOGD ("Create ise_selector notification with : %s", ime_selector_app.c_str ()); create_notification (&ise_selector_module_noti); } else - LOGW ("AppID with http://tizen.org/category/ime-selector category is not available\n"); + LOGW ("AppID with http://tizen.org/category/ime-selector category is not available"); } #endif @@ -7011,11 +7011,11 @@ static Eina_Bool x_event_window_property_cb (void *data, int ev_type, void *even if (ev->atom == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE) { if (ev->win == _control_window) { /* WMSYNC, #6 The keyboard window is displayed fully so set the conformant geometry */ - LOGD ("ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE : win : %p, atom : %d\n", ev->win, ev->atom); + LOGD ("ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_STATE : win : %p, atom : %d", ev->win, ev->atom); Ecore_X_Virtual_Keyboard_State state; state = ecore_x_e_virtual_keyboard_state_get (ev->win); if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_ON) { - LOGD ("ECORE_X_VIRTUAL_KEYBOARD_STATE_ON\n"); + LOGD ("ECORE_X_VIRTUAL_KEYBOARD_STATE_ON"); _ise_state = WINDOW_STATE_SHOW; /* Make sure that we have the same rotation angle with the keyboard window */ @@ -7025,11 +7025,11 @@ static Eina_Bool x_event_window_property_cb (void *data, int ev_type, void *even } if (_candidate_show_requested) { - LOGD ("calling ui_candidate_show (true)\n"); + LOGD ("calling ui_candidate_show (true)"); ui_candidate_show (true); } else { if (_candidate_area_1_visible) { - LOGD ("calling ui_candidate_show (false)\n"); + LOGD ("calling ui_candidate_show (false)"); ui_candidate_show (false); } } @@ -7058,7 +7058,7 @@ static Eina_Bool x_event_window_property_cb (void *data, int ev_type, void *even ecore_x_e_virtual_keyboard_state_set (_ise_window, ECORE_X_VIRTUAL_KEYBOARD_STATE_ON); } else if (state == ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF) { /* WMSYNC, #9 The keyboard window is hidden fully so send HIDE state */ - LOGD ("ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF\n"); + LOGD ("ECORE_X_VIRTUAL_KEYBOARD_STATE_OFF"); // For now don't send HIDE signal here //_info_manager->update_input_panel_event ( // ECORE_IMF_INPUT_PANEL_STATE_EVENT, ECORE_IMF_INPUT_PANEL_STATE_HIDE); @@ -7075,7 +7075,7 @@ static Eina_Bool x_event_window_property_cb (void *data, int ev_type, void *even _updated_hide_state_geometry = true; } if (_info_manager->get_current_toolbar_mode () == TOOLBAR_HELPER_MODE) { - LOGD ("calling ui_candidate_hide (true, false)\n"); + LOGD ("calling ui_candidate_hide (true, false)"); ui_candidate_hide (true, false); } else { ui_settle_candidate_window (); @@ -7098,7 +7098,7 @@ static Eina_Bool x_event_window_property_cb (void *data, int ev_type, void *even } else if (ev->atom == ECORE_X_ATOM_E_ILLUME_ROTATE_WINDOW_ANGLE) { if (ev->win == efl_get_quickpanel_window ()) { int angle = efl_get_quickpanel_window_angle (); - LOGD ("ev->win : %p, change window angle : %d\n", ev->win, angle); + LOGD ("ev->win : %p, change window angle : %d", ev->win, angle); } } @@ -7127,13 +7127,13 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event) if ((ev->win == _control_window)) { if (ev->message_type == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_ON_PREPARE_REQUEST) { /* WMSYNC, #4 Send WILL_SHOW event when the keyboard window is about to displayed */ - LOGD ("_ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_ON_PREPARE_REQUEST\n"); + LOGD ("_ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_ON_PREPARE_REQUEST"); /* WMSYNC, #5 Let the Window Manager to actually show keyboard window */ // WILL_SHOW_REQUEST_DONE Ack to WM Ecore_X_Window root_window = ecore_x_window_root_get (_control_window); ecore_x_e_virtual_keyboard_on_prepare_done_send (root_window, _control_window); - LOGD ("_ecore_x_e_virtual_keyboard_on_prepare_done_send (%x, %x)\n", + LOGD ("_ecore_x_e_virtual_keyboard_on_prepare_done_send (%x, %x)", root_window, _control_window); _info_manager->update_input_panel_event ( @@ -7144,7 +7144,7 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event) } else if (ev->message_type == ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_OFF_PREPARE_REQUEST) { _ise_state = WINDOW_STATE_WILL_HIDE; /* WMSYNC, #7 Send WILL_HIDE event when the keyboard window is about to hidden */ - LOGD ("_ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_OFF_PREPARE_REQUEST\n"); + LOGD ("_ECORE_X_ATOM_E_VIRTUAL_KEYBOARD_OFF_PREPARE_REQUEST"); // Clear conformant geometry information first if (_off_prepare_done_timer) { @@ -7183,7 +7183,7 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event) // PRE_ROTATE_DONE Ack to WM _candidate_angle = ev->data.l[1]; _ise_angle = ev->data.l[1]; - LOGD ("ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_PREPARE : %d\n", _candidate_angle); + LOGD ("ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_PREPARE : %d", _candidate_angle); if (_candidate_angle == 90 || _candidate_angle == 270) { ui_candidate_window_resize (_candidate_land_width, _candidate_land_height_min); @@ -7197,12 +7197,12 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event) ui_settle_candidate_window (); ui_candidate_window_rotate (_candidate_angle); Ecore_X_Window root_window = ecore_x_window_root_get (_control_window); - LOGD ("ecore_x_e_window_rotation_change_prepare_done_send (%d)\n", _candidate_angle); + LOGD ("ecore_x_e_window_rotation_change_prepare_done_send (%d)", _candidate_angle); ecore_x_e_window_rotation_change_prepare_done_send (root_window, _control_window, _candidate_angle); } else if (ev->message_type == ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST) { int ise_angle = (int)ev->data.l[1]; - LOGD ("ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST for ISE WINDOW : ISE angle : %d, Candidate angle : %d\n", ise_angle, _candidate_angle); + LOGD ("ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST for ISE WINDOW : ISE angle : %d, Candidate angle : %d", ise_angle, _candidate_angle); _candidate_angle = ise_angle; _ise_angle = ise_angle; if (_ise_state == WINDOW_STATE_SHOW) { @@ -7217,7 +7217,7 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event) if (ev->message_type == ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST) { _candidate_angle = (int)ev->data.l[1]; ui_candidate_window_rotate (_candidate_angle); - LOGD ("ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST : %d\n", _candidate_angle); + LOGD ("ECORE_X_ATOM_E_WINDOW_ROTATION_CHANGE_REQUEST : %d", _candidate_angle); } else if (ev->message_type == ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE && _ise_state != WINDOW_STATE_SHOW) { ecore_x_e_window_rotation_app_set (elm_win_xwindow_get (_candidate_window), EINA_TRUE); @@ -7230,7 +7230,7 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event) ui_candidate_window_rotate (_candidate_angle); ui_settle_candidate_window (); ecore_x_e_window_rotation_app_set (elm_win_xwindow_get (_candidate_window), EINA_FALSE); - LOGD ("ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE : %d\n", _candidate_angle); + LOGD ("ECORE_X_ATOM_E_ILLUME_ROTATE_ROOT_ANGLE : %d", _candidate_angle); } SCIM_DEBUG_MAIN (3) << __FUNCTION__ << " : ANGLE (" << _candidate_angle << ")\n"; } @@ -7330,7 +7330,7 @@ static Eina_Bool x_event_client_message_cb (void *data, int type, void *event) strTts = String (_("close button")); evas_object_geometry_get (_close_btn, &x, &y, &w, &h); } else { - LOGW ("TTS focus index = %d\n", _candidate_tts_focus_index); + LOGW ("TTS focus index = %d", _candidate_tts_focus_index); ui_tts_focus_rect_hide (); } @@ -7363,7 +7363,7 @@ Eina_Bool check_focus_out_by_popup_win () if (!ecore_x_netwm_window_type_get (focus_win, &win_type)) return EINA_FALSE; - LOGD ("win type : %d\n", win_type); + LOGD ("win type : %d", win_type); if (win_type == ECORE_X_WINDOW_TYPE_POPUP_MENU || win_type == ECORE_X_WINDOW_TYPE_NOTIFICATION) { @@ -7392,14 +7392,14 @@ static Eina_Bool x_event_window_focus_out_cb (void *data, int ev_type, void *eve #if ENABLE_MULTIWINDOW_SUPPORT unsigned int layout = 0; - LOGD ("Application window focus OUT!\n"); + LOGD ("Application window focus OUT!"); delete_ise_hide_timer (); // Check multi window mode if (ecore_x_window_prop_card32_get (efl_get_app_window (), ECORE_X_ATOM_E_WINDOW_DESKTOP_LAYOUT, &layout, 1) != -1) { if (layout == 0 || layout == 1) { // Split mode - LOGD ("Multi window mode. start timer to hide IME\n"); + LOGD ("Multi window mode. start timer to hide IME"); // Use timer not to hide and show IME again in focus-out and focus-in event between applications _ise_hide_timer = ecore_timer_add (ISF_ISE_HIDE_DELAY, ise_hide_timeout, NULL); @@ -7407,13 +7407,13 @@ static Eina_Bool x_event_window_focus_out_cb (void *data, int ev_type, void *eve } if (!_ise_hide_timer) { - LOGD ("Panel hides ISE\n"); + LOGD ("Panel hides ISE"); _info_manager->hide_helper (_info_manager->get_current_helper_uuid ()); slot_hide_ise (); ui_candidate_hide (true, false, false); } #else - LOGD ("Application window focus OUT! Panel hides ISE\n"); + LOGD ("Application window focus OUT! Panel hides ISE"); _info_manager->hide_helper (_info_manager->get_current_helper_uuid ()); slot_hide_ise (); ui_candidate_hide (true, false, false); @@ -7490,7 +7490,7 @@ int main (int argc, char *argv []) #endif check_time ("\nStarting ISF Panel EFL...... "); - ISF_SAVE_LOG ("Starting ISF Panel EFL......\n"); + ISF_SAVE_LOG ("Starting ISF Panel EFL......"); DebugOutput::disable_debug (SCIM_DEBUG_AllMask); DebugOutput::enable_debug (SCIM_DEBUG_MainMask); @@ -7662,7 +7662,7 @@ int main (int argc, char *argv []) if (!initialize_panel_agent (_config, display_name, should_resident)) { check_time ("Failed to initialize Panel Agent!"); std::cerr << "Failed to initialize Panel Agent!\n"; - LOGE ("Failed to initialize Panel Agent!\n"); + LOGE ("Failed to initialize Panel Agent!"); ret = -1; goto cleanup; } @@ -7693,7 +7693,7 @@ int main (int argc, char *argv []) #ifdef HAVE_ECOREX if (!efl_create_control_window ()) { - LOGW ("Failed to create control window\n"); + LOGW ("Failed to create control window"); goto cleanup; } #endif @@ -7731,7 +7731,7 @@ int main (int argc, char *argv []) #endif if (0 != register_edbus_signal_handler ()) - LOGW ("register edbus signal fail\n"); + LOGW ("register edbus signal fail"); try { /* Update ISE list */ @@ -7777,11 +7777,11 @@ int main (int argc, char *argv []) /* Register the callback function of Bluetooth connection */ ret = bt_initialize (); if (ret != BT_ERROR_NONE) - LOGW ("Fail to init Bluetooth\n"); + LOGW ("Fail to init Bluetooth"); ret = bt_hid_host_initialize (_bt_cb_hid_state_changed, NULL); if (ret != BT_ERROR_NONE) - LOGW ("bt_hid_host_initialize failed\n"); + LOGW ("bt_hid_host_initialize failed"); #endif #if ENABLE_REMOTE_INPUT @@ -7818,7 +7818,7 @@ int main (int argc, char *argv []) check_time ("EFL Panel launch time"); if (!isf_cynara_initialize()) - LOGW ("Failed to initialize cynara\n"); + LOGW ("Failed to initialize cynara"); #if ISF_BUILD_CANDIDATE_UI elm_run (); @@ -7837,11 +7837,11 @@ int main (int argc, char *argv []) /* deinitialize the callback function of Bluetooth connection */ ret = bt_hid_host_deinitialize (); if (ret != BT_ERROR_NONE) - LOGW ("bt_hid_host_deinitialize failed: %d\n", ret); + LOGW ("bt_hid_host_deinitialize failed: %d", ret); ret = bt_deinitialize (); if (ret != BT_ERROR_NONE) - LOGW ("bt_deinitialize failed: %d\n", ret); + LOGW ("bt_deinitialize failed: %d", ret); #endif #ifdef HAVE_ECOREX @@ -7917,7 +7917,7 @@ cleanup: delete []new_argv; } - ISF_SAVE_LOG ("ret=%d\n", ret); + ISF_SAVE_LOG ("ret=%d", ret); if (ret == 0) { std::cerr << "Successfully exited.\n"; return 0; diff --git a/ism/extras/efl_panel/remote_input.cpp b/ism/extras/efl_panel/remote_input.cpp index ee83cb5..b6988a5 100644 --- a/ism/extras/efl_panel/remote_input.cpp +++ b/ism/extras/efl_panel/remote_input.cpp @@ -194,12 +194,12 @@ void Remote_Input::exit() /* Close uinput device */ if (ioctl(fd_uinput_keyboard, UI_DEV_DESTROY) < 0) { - LOGD ("error destroy\n"); + LOGD ("error destroy"); } close(fd_uinput_keyboard); if (ioctl(fd_uinput_mouse, UI_DEV_DESTROY) < 0) { - LOGD ("error destroy\n"); + LOGD ("error destroy"); } close(fd_uinput_mouse); } @@ -223,7 +223,7 @@ _ecore_wl_keymap_update_cb (void *data, int ev_type, void *event) fd_uinput_keyboard = open_file(file_name); if (fd_uinput_keyboard < 0) { - LOGW ("Fail to open fd uinput_keyboard!\n"); + LOGW ("Fail to open fd uinput_keyboard!"); return ECORE_CALLBACK_CANCEL; } @@ -235,34 +235,34 @@ _ecore_wl_keymap_update_cb (void *data, int ev_type, void *event) device_key.id.version = 1; if (write(fd_uinput_keyboard, &device_key, sizeof(device_key)) != sizeof(device_key)) { - LOGW ("Fail to setup uinput structure on fd\n"); + LOGW ("Fail to setup uinput structure on fd"); return ECORE_CALLBACK_CANCEL; } if (ioctl(fd_uinput_keyboard, UI_SET_EVBIT, EV_KEY) < 0) { - LOGW ("Fail to enable EV_KEY event type\n"); + LOGW ("Fail to enable EV_KEY event type"); return ECORE_CALLBACK_CANCEL; } if (ioctl(fd_uinput_keyboard, UI_SET_EVBIT, EV_SYN) < 0) { - LOGW ("Fail to enable EV_SYN event type\n"); + LOGW ("Fail to enable EV_SYN event type"); return ECORE_CALLBACK_CANCEL; } for (unsigned int i = 0; i < REMOTE_KEY_NAMES; i++) { if (remote_key_names[i].value >= REMOTE_KEY_TV_POWER) { int keycode = keycode_get_from_string((char *)remote_key_names[i].name); - SECURE_LOGD("remote init Key name: %s, key code : %d\n", (char *)remote_key_names[i].name, keycode); + SECURE_LOGD("remote init Key name: %s, key code : %d", (char *)remote_key_names[i].name, keycode); if (ioctl(fd_uinput_keyboard, UI_SET_KEYBIT, keycode) < 0) { - LOGW ("Fail to register uinput event key\n"); + LOGW ("Fail to register uinput event key"); return ECORE_CALLBACK_CANCEL; } } } if (ioctl(fd_uinput_keyboard, UI_DEV_CREATE) < 0) { - LOGW ("Fail to create keyboard uinput device\n"); + LOGW ("Fail to create keyboard uinput device"); return ECORE_CALLBACK_CANCEL; } @@ -274,7 +274,7 @@ bool Remote_Input::init_uinput_keyboard_device() keymap_update_handler = ecore_event_handler_add (ECORE_WL_EVENT_KEYMAP_UPDATE, _ecore_wl_keymap_update_cb, NULL); if (!keymap_update_handler) { - LOGD ("Add keymap update callback failed\n"); + LOGD ("Add keymap update callback failed"); return false; } @@ -294,7 +294,7 @@ bool Remote_Input::init_uinput_mouse_device() fd_uinput_mouse = open_file(file_name); if (fd_uinput_mouse < 0) { - LOGW ("Fail to open fd uinput_mouse!\n"); + LOGW ("Fail to open fd uinput_mouse!"); return false; } @@ -306,41 +306,41 @@ bool Remote_Input::init_uinput_mouse_device() device_mouse.id.version = 1; if (write(fd_uinput_mouse, &device_mouse, sizeof(device_mouse)) != sizeof(device_mouse)) { - LOGW ("Fail to setup uinput structure on fd\n"); + LOGW ("Fail to setup uinput structure on fd"); return false; } if (ioctl(fd_uinput_mouse, UI_SET_EVBIT, EV_KEY) < 0) { - LOGW ("Fail to enable EV_KEY event type\n"); + LOGW ("Fail to enable EV_KEY event type"); return false; } for (unsigned int i = 0; i < sizeof(uinput_btns)/sizeof(uinput_btns[0]); i++) { if (ioctl(fd_uinput_mouse, UI_SET_KEYBIT, uinput_btns[i]) < 0) { - LOGW ("Fail to register uinput event key: %d\n", uinput_btns[i]); + LOGW ("Fail to register uinput event key: %d", uinput_btns[i]); return false; } } if (ioctl(fd_uinput_mouse, UI_SET_EVBIT, EV_REL) < 0) { - LOGW ("Fail to enable EV_REL event type\n"); + LOGW ("Fail to enable EV_REL event type"); return false; } for (unsigned int i = 0; i < sizeof(uinput_rel_axes)/sizeof(uinput_rel_axes[0]); i++) { if (ioctl(fd_uinput_mouse, UI_SET_RELBIT, uinput_rel_axes[i]) < 0) { - LOGW ("Fail to register uinput event key: %d\n", uinput_rel_axes[i]); + LOGW ("Fail to register uinput event key: %d", uinput_rel_axes[i]); return false; } } if (ioctl(fd_uinput_mouse, UI_SET_EVBIT, EV_SYN) < 0) { - LOGW ("Fail to enable EV_SYN event type\n"); + LOGW ("Fail to enable EV_SYN event type"); return false; } if (ioctl(fd_uinput_mouse, UI_DEV_CREATE) < 0) { - LOGW ("Fail to create keyboard uinput device\n"); + LOGW ("Fail to create keyboard uinput device"); return false; } diff --git a/ism/extras/kbd_mode_changer/main.cpp b/ism/extras/kbd_mode_changer/main.cpp index e2dedc2..cb3bdd1 100644 --- a/ism/extras/kbd_mode_changer/main.cpp +++ b/ism/extras/kbd_mode_changer/main.cpp @@ -31,26 +31,26 @@ static bool app_create (void *user_data) { - LOGD ("app create\n"); + LOGD ("app create"); return true; } static void app_control (app_control_h app_control, void *user_data) { - LOGD ("%s\n", __func__); + LOGD ("%s", __func__); - LOGD ("isf_extra_hwkbd_module start\n"); + LOGD ("isf_extra_hwkbd_module start"); /* Toggle input mode */ #ifdef HAVE_VCONF int val = 1; if (vconf_get_bool (VCONFKEY_ISF_HW_KEYBOARD_INPUT_DETECTED, &val) != 0) - LOGW ("Failed to get vconf key\n"); + LOGW ("Failed to get vconf key"); if (vconf_set_bool (VCONFKEY_ISF_HW_KEYBOARD_INPUT_DETECTED, !val) != 0) - LOGW ("Failed to set vconf key\n"); + LOGW ("Failed to set vconf key"); else - LOGD ("Succeeded to set vconf key\n"); + LOGD ("Succeeded to set vconf key"); #endif ui_app_exit (); @@ -58,7 +58,7 @@ static void app_control (app_control_h app_control, void *user_data) static void app_terminate (void *user_data) { - LOGD ("app terminated\n"); + LOGD ("app terminated"); } EXAPI int main (int argc, char *argv []) @@ -69,7 +69,7 @@ EXAPI int main (int argc, char *argv []) event_callback.terminate = app_terminate; event_callback.app_control = app_control; - LOGD ("start org.tizen.isf-kbd-mode-changer\n"); + LOGD ("start org.tizen.isf-kbd-mode-changer"); return ui_app_main (argc, argv, &event_callback, NULL); } diff --git a/ism/extras/pkgmgr_parser/ime_parser.c b/ism/extras/pkgmgr_parser/ime_parser.c index bcd9eaa..1f6879d 100644 --- a/ism/extras/pkgmgr_parser/ime_parser.c +++ b/ism/extras/pkgmgr_parser/ime_parser.c @@ -55,13 +55,13 @@ int PKGMGR_CATEGORY_PARSER_PLUGIN_INSTALL(const char *pkgid, const char *appid, ret = pkgmgrinfo_appinfo_get_appinfo(appid, &appinfo_handle); if (ret != PMINFO_R_OK) { - LOGW("pkgmgrinfo_appinfo_get_appinfo() failed\n"); + LOGW("pkgmgrinfo_appinfo_get_appinfo() failed"); return -1; } ret = pkgmgrinfo_appinfo_get_exec(appinfo_handle, &exec_path); if (ret != PMINFO_R_OK) { - LOGW("pkgmgrinfo_appinfo_get_exec() failed\n"); + LOGW("pkgmgrinfo_appinfo_get_exec() failed"); pkgmgrinfo_appinfo_destroy_appinfo(appinfo_handle); return -1; } @@ -69,7 +69,7 @@ int PKGMGR_CATEGORY_PARSER_PLUGIN_INSTALL(const char *pkgid, const char *appid, /* Try to get in global packages */ ret = pkgmgrinfo_pkginfo_get_pkginfo(pkgid, &pkginfo_handle); if (ret != PMINFO_R_OK) { - LOGW("pkgmgrinfo_pkginfo_get_pkginfo() failed\n"); + LOGW("pkgmgrinfo_pkginfo_get_pkginfo() failed"); pkgmgrinfo_appinfo_destroy_appinfo(appinfo_handle); return -1; } @@ -92,12 +92,12 @@ int PKGMGR_CATEGORY_PARSER_PLUGIN_INSTALL(const char *pkgid, const char *appid, /* In case of no executable in bin directory of package's root path */ /* Create symbolic link for launching and supporting application FW APIs */ if (symlink (SCIM_HELPER_LAUNCHER_PROGRAM, exec_path) != 0) - LOGW("Failed to create symbolic link : %s\n", exec_path); + LOGW("Failed to create symbolic link : %s", exec_path); else - LOGD("Succeeded to create symbolic link : %s\n", exec_path); + LOGD("Succeeded to create symbolic link : %s", exec_path); } else { - LOGW("Can't create symbolic link. %s is existed\n", exec_path); + LOGW("Can't create symbolic link. %s is existed", exec_path); } } diff --git a/ism/extras/wayland_immodule/wayland_imcontext.c b/ism/extras/wayland_immodule/wayland_imcontext.c index 0026552..93f61da 100644 --- a/ism/extras/wayland_immodule/wayland_imcontext.c +++ b/ism/extras/wayland_immodule/wayland_imcontext.c @@ -325,7 +325,7 @@ static void input_language_changed_cb (keynode_t *key, void* data) char *input_lang = vconf_keynode_get_str (key); if (input_lang) { set_input_language (input_lang); - LOGD("input lang : %s\n", input_lang); + LOGD("input lang : %s", input_lang); } } @@ -390,7 +390,7 @@ autoperiod_insert (Ecore_IMF_Context *ctx) ulen = eina_unicode_strlen (ustr); if (cursor_pos < 2 || cursor_pos > (int)ulen) { - LOGD ("invalid range. cursor pos : %d, length : %d\n", cursor_pos, ulen); + LOGD ("invalid range. cursor pos : %d, length : %d", cursor_pos, ulen); goto done; } @@ -585,7 +585,7 @@ set_autocapital (Ecore_IMF_Context *ctx) uppercase = analyze_surrounding_text (ctx); } - SECURE_LOGD ("ctx : %p, auto capital : %d\n", ctx, uppercase); + SECURE_LOGD ("ctx : %p, auto capital : %d", ctx, uppercase); wl_text_input_set_capital_mode (imcontext->text_input, uppercase); } @@ -721,7 +721,7 @@ key_down_filter_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) _input_panel_state == ECORE_IMF_INPUT_PANEL_STATE_WILL_SHOW) && check_hide_key(ev->keyname)) { - SECURE_LOGD ("%s key is pressed.\n", ev->keyname); + SECURE_LOGD ("%s key is pressed.", ev->keyname); Ecore_IMF_Event_Key_Down imf_event; Eina_Bool filter_ret = EINA_FALSE; @@ -731,9 +731,9 @@ key_down_filter_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) if (_focused_ctx) filter_ret = ecore_imf_context_filter_event(_focused_ctx, ECORE_IMF_EVENT_KEY_DOWN, (Ecore_IMF_Event *)&imf_event); else - LOGD("no focus\n"); + LOGD("no focus"); - SECURE_LOGD ("%s key is pressed. ret : %d\n", ev->keyname, filter_ret); + SECURE_LOGD ("%s key is pressed. ret : %d", ev->keyname, filter_ret); if (filter_ret) { return EINA_FALSE; /* the event is removed from the queue */ } @@ -760,7 +760,7 @@ key_up_filter_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) !check_hide_key(ev->keyname)) return EINA_TRUE; /* the event is kept */ - SECURE_LOGD ("%s key is released.\n", ev->keyname); + SECURE_LOGD ("%s key is released.", ev->keyname); Ecore_IMF_Event_Key_Up imf_event; Eina_Bool filter_ret = EINA_FALSE; @@ -770,9 +770,9 @@ key_up_filter_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) if (_focused_ctx) filter_ret = ecore_imf_context_filter_event(_focused_ctx, ECORE_IMF_EVENT_KEY_UP, (Ecore_IMF_Event *)&imf_event); else - LOGD("no focus\n"); + LOGD("no focus"); - SECURE_LOGD ("%s key is released. ret : %d\n", ev->keyname, filter_ret); + SECURE_LOGD ("%s key is released. ret : %d", ev->keyname, filter_ret); if (filter_ret) { return EINA_FALSE; /* the event is removed from the queue */ } @@ -895,7 +895,7 @@ _send_input_panel_hide_request(Ecore_IMF_Context *ctx) if (imcontext && imcontext->text_input) { wl_text_input_hide_input_panel(imcontext->text_input); } else { - LOGD("creating temporary context for sending hide request\n"); + LOGD("creating temporary context for sending hide request"); const char *ctx_id = ecore_imf_context_default_id_get(); Ecore_IMF_Context *temp_context = ecore_imf_context_add(ctx_id); if (temp_context) { @@ -1284,19 +1284,19 @@ set_focus(Ecore_IMF_Context *ctx) if (!imcontext) return EINA_FALSE; if (!imcontext->window) { - LOGW("window is not given\n"); + LOGW("window is not given"); return EINA_FALSE; } Ecore_Wl_Input *input = ecore_wl_window_keyboard_get(imcontext->window); if (!input) { - LOGW("ctx : %p, Can't get Wl_Input\n", ctx); + LOGW("ctx : %p, Can't get Wl_Input", ctx); return EINA_FALSE; } struct wl_seat *seat = ecore_wl_input_seat_get(input); if (!seat) { - LOGW("ctx : %p, Can't get Wl_seat\n", ctx); + LOGW("ctx : %p, Can't get Wl_seat", ctx); return EINA_FALSE; } @@ -1374,11 +1374,11 @@ static Eina_Bool _client_window_focus_out_cb(void *data, int ev_type, void *ev) unsigned int client_win_id = ecore_wl_window_id_get (imcontext->window); - LOGD ("ctx : %p, client_window id : %#x, focus-out win : %#x\n", ctx, client_win_id, e->win); + LOGD ("ctx : %p, client_window id : %#x, focus-out win : %#x", ctx, client_win_id, e->win); if (client_win_id > 0) { if (e->win == client_win_id) { - LOGD ("window focus out\n"); + LOGD ("window focus out"); if (_focused_ctx == ctx) { wayland_im_context_focus_out (ctx); @@ -1403,12 +1403,12 @@ static void send_will_hide_ack(Ecore_IMF_Context *ctx) WaylandIMContext *imcontext = NULL; if (!ctx) { - LOGD("ctx is NULL\n"); + LOGD("ctx is NULL"); need_temporary_context = EINA_TRUE; } else { imcontext = (WaylandIMContext *)ecore_imf_context_data_get(ctx); if (!imcontext) { - LOGD("imcontext is NULL :%p\n", ctx); + LOGD("imcontext is NULL :%p", ctx); need_temporary_context = EINA_TRUE; } else { has_conformant = imcontext->has_conformant; @@ -1419,7 +1419,7 @@ static void send_will_hide_ack(Ecore_IMF_Context *ctx) meaning that there is no connection available for communicating with the window manager. So we are creating a temporary context for sending WILL_HIDE_ACK message */ if (need_temporary_context) { - LOGD("creating temporary context for sending WILL_HIDE_ACK\n"); + LOGD("creating temporary context for sending WILL_HIDE_ACK"); const char *ctx_id = ecore_imf_context_default_id_get(); ctx = ecore_imf_context_add(ctx_id); if (ctx) { @@ -1430,16 +1430,16 @@ static void send_will_hide_ack(Ecore_IMF_Context *ctx) if (ctx && imcontext) { if (ecore_imf_context_client_canvas_get(ctx) && has_conformant) { if (_conformant_reset_done && _received_will_hide_event) { - LOGD("Send will hide ack, _conformant_reset_done = 1, received_will_hide_event = 1\n"); + LOGD("Send will hide ack, _conformant_reset_done = 1, received_will_hide_event = 1"); _send_will_hide_ack(imcontext); _conformant_reset_done = EINA_FALSE; _received_will_hide_event = EINA_FALSE; } else { - LOGD ("_conformant_reset_done=%d, received_will_hide_event=%d\n", + LOGD ("_conformant_reset_done=%d, received_will_hide_event=%d", _conformant_reset_done, _received_will_hide_event); } } else { - LOGD("Send will hide ack right away, since there is no conformant available : %p %d\n", + LOGD("Send will hide ack right away, since there is no conformant available : %p %d", ecore_imf_context_client_canvas_get(ctx), has_conformant); _send_will_hide_ack (imcontext); } @@ -1457,7 +1457,7 @@ static void _render_post_cb(void *data, Evas *e, void *event_info) void *callback = evas_event_callback_del(e, EVAS_CALLBACK_RENDER_POST, _render_post_cb); _conformant_reset_done = EINA_TRUE; _conformant_reset_started = EINA_FALSE; - LOGD("[_render_post_cb], _conformant_reset_done = 1 , %p\n", callback); + LOGD("[_render_post_cb], _conformant_reset_done = 1 , %p", callback); send_will_hide_ack(NULL); } @@ -1476,7 +1476,7 @@ static Eina_Bool _conformant_change_cb(void *data, int ev_type, void *ev) if (!window) return ECORE_CALLBACK_PASS_ON; if (!(e->state)) { - LOGD("_conformant_reset_done = 0, registering _render_post_cb : %p %p\n", _active_context_canvas, window); + LOGD("_conformant_reset_done = 0, registering _render_post_cb : %p %p", _active_context_canvas, window); _conformant_reset_done = EINA_FALSE; if (_active_context_canvas && ecore_wl_window_conformant_get(window) && !_custom_conformant_event) { evas_event_callback_del(_active_context_canvas, EVAS_CALLBACK_RENDER_POST, _render_post_cb); @@ -1535,7 +1535,7 @@ static Eina_Bool _conformant_change_cb(void *data, int ev_type, void *ev) _keyboard_geometry.h = h; } LOGD("[KEYPAD]: scr %dx%d, rot %d, orig (%d,%d, %dx%d)", scr_w, scr_h, rot, x, y, w, h); - LOGD ("IME geometry x : %d, y : %d, w : %d, h : %d\n", _keyboard_geometry.x, _keyboard_geometry.y, _keyboard_geometry.w, _keyboard_geometry.h); + LOGD ("IME geometry x : %d, y : %d, w : %d, h : %d", _keyboard_geometry.x, _keyboard_geometry.y, _keyboard_geometry.w, _keyboard_geometry.h); ecore_imf_context_input_panel_event_callback_call(ctx, ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0); } } @@ -1672,7 +1672,7 @@ show_input_panel(Ecore_IMF_Context *ctx) get_purpose(ctx)); if (ecore_imf_context_surrounding_get(imcontext->ctx, &surrounding, &cursor_pos)) { - SECURE_LOGD ("surrounding text : %s\n", surrounding); + SECURE_LOGD ("surrounding text : %s", surrounding); if (surrounding) free (surrounding); @@ -1700,26 +1700,26 @@ show_input_panel(Ecore_IMF_Context *ctx) wl_text_input_set_input_panel_position(imcontext->text_input, imcontext->input_panel_position.x, imcontext->input_panel_position.y); - SECURE_LOGD ("ctx : %p, layout : %d, layout variation : %d\n", ctx, + SECURE_LOGD ("ctx : %p, layout : %d, layout variation : %d", ctx, layout, layout_variation); - SECURE_LOGD ("language : %d, cursor position : %d, input hint : %#x, bidi direction : %d\n", + SECURE_LOGD ("language : %d, cursor position : %d, input hint : %#x, bidi direction : %d", ecore_imf_context_input_panel_language_get (ctx), cursor_pos, ecore_imf_context_input_hint_get (ctx), imcontext->bidi_direction); - SECURE_LOGD ("return key type : %d, return key disabled : %d, autocapital type : %d\n", + SECURE_LOGD ("return key type : %d, return key disabled : %d, autocapital type : %d", ecore_imf_context_input_panel_return_key_type_get (ctx), ecore_imf_context_input_panel_return_key_disabled_get (ctx), ecore_imf_context_autocapital_type_get (ctx)); - SECURE_LOGD ("client_window : %#x, password mode : %d, prediction_allow : %d\n", + SECURE_LOGD ("client_window : %#x, password mode : %d, prediction_allow : %d", (unsigned long int)ecore_imf_context_client_window_get (ctx), (imcontext->content_hint & WL_TEXT_INPUT_CONTENT_HINT_SENSITIVE_DATA) ? 1 : 0, ecore_imf_context_prediction_allow_get (ctx)); - SECURE_LOGD ("mime_type : %s, input panel position x : %d, y : %d\n", + SECURE_LOGD ("mime_type : %s, input panel position x : %d, y : %d", imcontext->mime_type, imcontext->input_panel_position.x, imcontext->input_panel_position.y); if (_active_context_canvas && !evas_focus_state_get (_active_context_canvas)) { - LOGW ("Canvas does not have focus!\n"); + LOGW ("Canvas does not have focus!"); } // @@ -2057,7 +2057,7 @@ text_input_input_panel_state(void *data EINA_UNUSED, will_hide = EINA_FALSE; _received_will_hide_event = EINA_TRUE; - LOGD("_received_will_hide_event = 1\n"); + LOGD("_received_will_hide_event = 1"); send_will_hide_ack(imcontext->ctx); break; case WL_TEXT_INPUT_INPUT_PANEL_STATE_SHOW: @@ -2065,7 +2065,7 @@ text_input_input_panel_state(void *data EINA_UNUSED, _received_will_hide_event = EINA_FALSE; if (!_show_req_ctx) _show_req_ctx = imcontext->ctx; - LOGD("_received_will_hide_event = 0\n"); + LOGD("_received_will_hide_event = 0"); break; default: _input_panel_state = (Ecore_IMF_Input_Panel_State)state; @@ -2078,7 +2078,7 @@ text_input_input_panel_state(void *data EINA_UNUSED, if (state == WL_TEXT_INPUT_INPUT_PANEL_STATE_HIDE) { reset_keyboard_geometry(); - LOGD ("IME geometry x : %d, y : %d, w : %d, h : %d\n", _keyboard_geometry.x, _keyboard_geometry.y, _keyboard_geometry.w, _keyboard_geometry.h); + LOGD ("IME geometry x : %d, y : %d, w : %d, h : %d", _keyboard_geometry.x, _keyboard_geometry.y, _keyboard_geometry.w, _keyboard_geometry.h); ecore_imf_context_input_panel_event_callback_call(imcontext->ctx, ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0); } // @@ -2102,7 +2102,7 @@ text_input_input_panel_geometry(void *data EINA_UNUSED, _keyboard_geometry.y = y; _keyboard_geometry.w = w; _keyboard_geometry.h = h; - LOGD ("IME geometry x : %d, y : %d, w : %d, h : %d\n", _keyboard_geometry.x, _keyboard_geometry.y, _keyboard_geometry.w, _keyboard_geometry.h); + LOGD ("IME geometry x : %d, y : %d, w : %d, h : %d", _keyboard_geometry.x, _keyboard_geometry.y, _keyboard_geometry.w, _keyboard_geometry.h); ecore_imf_context_input_panel_event_callback_call(imcontext->ctx, ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT, 0); } } @@ -2213,7 +2213,7 @@ text_input_commit_content(void *data, ev.mime_types = mime_types; ev.description = description; - SECURE_LOGD("commit content : %s, description : %s, mime types : %s\n", content, description, mime_types); + SECURE_LOGD("commit content : %s, description : %s, mime types : %s", content, description, mime_types); ecore_imf_context_event_callback_call(imcontext->ctx, ECORE_IMF_CALLBACK_COMMIT_CONTENT, (void *)&ev); } @@ -2463,7 +2463,7 @@ text_input_input_panel_event(void *data, WaylandIMContext *imcontext = (WaylandIMContext *)data; if (!imcontext || !imcontext->ctx) return; - LOGD("event type : %d, value : %d\n", event_type, value); + LOGD("event type : %d, value : %d", event_type, value); ecore_imf_context_input_panel_event_callback_call(imcontext->ctx, event_type, value); } @@ -2506,7 +2506,7 @@ keyboard_mode_changed_cb (keynode_t *key, void* data) hw_keyboard_mode = vconf_keynode_get_bool (key); Ecore_IMF_Context *active_ctx = get_using_ctx (); if (active_ctx) { - LOGD ("ctx : %p, input detect : %d\n", active_ctx, hw_keyboard_mode); + LOGD ("ctx : %p, input detect : %d", active_ctx, hw_keyboard_mode); Ecore_IMF_Input_Panel_Keyboard_Mode input_mode = hw_keyboard_mode ? ECORE_IMF_INPUT_PANEL_HW_KEYBOARD_MODE : ECORE_IMF_INPUT_PANEL_SW_KEYBOARD_MODE; ecore_imf_context_input_panel_event_callback_call (active_ctx, ECORE_IMF_INPUT_PANEL_KEYBOARD_MODE_EVENT, input_mode); @@ -2721,7 +2721,7 @@ wayland_im_context_reset(Ecore_IMF_Context *ctx) void wayland_im_context_focus_in(Ecore_IMF_Context *ctx) { - LOGD ("ctx : %p. enable : %d, on demand : %d\n", ctx, + LOGD ("ctx : %p. enable : %d, on demand : %d", ctx, ecore_imf_context_input_panel_enabled_get(ctx), ecore_imf_context_input_panel_show_on_demand_get (ctx)); @@ -2757,9 +2757,9 @@ wayland_im_context_focus_in(Ecore_IMF_Context *ctx) if (!ecore_imf_context_input_panel_show_on_demand_get (ctx)) show_input_panel(ctx); else - LOGD ("ctx : %p input panel on demand mode : TRUE\n", ctx); + LOGD ("ctx : %p input panel on demand mode : TRUE", ctx); else - LOGD ("ctx : %p input panel enable : FALSE\n", ctx); + LOGD ("ctx : %p input panel enable : FALSE", ctx); } void @@ -2856,7 +2856,7 @@ wayland_im_context_cursor_position_set (Ecore_IMF_Context *ctx, imcontext->cursor_position = cursor_pos; if (imcontext->input && imcontext->text_input) { - LOGD ("ctx : %p, cursor pos : %d\n", ctx, cursor_pos); + LOGD ("ctx : %p, cursor pos : %d", ctx, cursor_pos); set_autocapital (ctx); @@ -2990,12 +2990,12 @@ wayland_im_context_filter_event(Ecore_IMF_Context *ctx, #endif if (type == ECORE_IMF_EVENT_MOUSE_UP) { if (ecore_imf_context_input_panel_enabled_get(ctx)) { - LOGD ("[Mouse-up event] ctx : %p\n", ctx); + LOGD ("[Mouse-up event] ctx : %p", ctx); if (ctx == _focused_ctx) { ecore_imf_context_input_panel_show(ctx); } else - LOGE ("Can't show IME because there is no focus. ctx : %p\n", ctx); + LOGE ("Can't show IME because there is no focus. ctx : %p", ctx); } } #if !(ENABLE_GRAB_KEYBOARD) @@ -3032,13 +3032,13 @@ wayland_im_context_filter_event(Ecore_IMF_Context *ctx, return EINA_FALSE; if (!_focused_ctx) { - LOGW ("no focus\n"); + LOGW ("no focus"); return EINA_FALSE; } if (_focused_ctx != ctx) { - LOGW ("focused context is different from the context used in ecore_imf_context_filter_event.\n"); - LOGW ("focus context : %p, context : %p\n", _focused_ctx, ctx); + LOGW ("focused context is different from the context used in ecore_imf_context_filter_event."); + LOGW ("focus context : %p, context : %p", _focused_ctx, ctx); return EINA_FALSE; } @@ -3178,7 +3178,7 @@ void wayland_im_context_autocapital_type_set(Ecore_IMF_Context *ctx, imcontext->content_hint |= WL_TEXT_INPUT_CONTENT_HINT_LOWERCASE; if (imcontext->input && imcontext->text_input) { - LOGD ("ctx : %p. set autocapital type : %d\n", ctx, autocapital_type); + LOGD ("ctx : %p. set autocapital type : %d", ctx, autocapital_type); wl_text_input_set_content_type(imcontext->text_input, imcontext->content_hint, get_purpose(ctx)); @@ -3245,7 +3245,7 @@ wayland_im_context_input_panel_layout_set(Ecore_IMF_Context *ctx, } if (imcontext->input && imcontext->text_input) { - LOGD ("ctx : %p, layout type : %d\n", ctx, layout); + LOGD ("ctx : %p, layout type : %d", ctx, layout); wl_text_input_set_content_type(imcontext->text_input, imcontext->content_hint, get_purpose(ctx)); @@ -3274,7 +3274,7 @@ wayland_im_context_input_mode_set(Ecore_IMF_Context *ctx, imcontext->content_hint &= ~(WL_TEXT_INPUT_CONTENT_HINT_SENSITIVE_DATA | WL_TEXT_INPUT_CONTENT_HINT_PASSWORD); if (imcontext->input && imcontext->text_input) { - LOGD ("ctx : %p, input mode : %d\n", ctx, input_mode); + LOGD ("ctx : %p, input mode : %d", ctx, input_mode); wl_text_input_set_content_type(imcontext->text_input, imcontext->content_hint, get_purpose(ctx)); @@ -3304,7 +3304,7 @@ wayland_im_context_input_hint_set(Ecore_IMF_Context *ctx, imcontext->content_hint &= ~WL_TEXT_INPUT_CONTENT_HINT_MULTILINE; if (imcontext->input && imcontext->text_input) { - LOGD("ctx : %p, input hint : %#x\n", ctx, input_hints); + LOGD("ctx : %p, input hint : %#x", ctx, input_hints); wl_text_input_set_content_type(imcontext->text_input, imcontext->content_hint, get_purpose(ctx)); @@ -3431,7 +3431,7 @@ wayland_im_context_input_panel_imdata_set(Ecore_IMF_Context *ctx, const void *da if (strncmp(data, custom_conformant_finished, strlen(custom_conformant_finished)) == 0) { if (_custom_conformant_event) { _conformant_reset_done = EINA_TRUE; - LOGD("[conformant:custom,finished], _conformant_reset_done = 1\n"); + LOGD("[conformant:custom,finished], _conformant_reset_done = 1"); send_will_hide_ack(NULL); } return; @@ -3480,7 +3480,7 @@ wayland_im_context_bidi_direction_set(Ecore_IMF_Context *ctx, Ecore_IMF_BiDi_Dir imcontext->bidi_direction = bidi_direction; if (imcontext->input && imcontext->text_input) { - LOGD ("ctx : %p, bidi direction : %#x\n", ctx, bidi_direction); + LOGD ("ctx : %p, bidi direction : %#x", ctx, bidi_direction); wl_text_input_bidi_direction(imcontext->text_input, imcontext->bidi_direction); } } @@ -3501,7 +3501,7 @@ wayland_im_context_prediction_hint_set (Ecore_IMF_Context *ctx, const char *pred imcontext->prediction_hint = strdup(prediction_hint ? prediction_hint : ""); if (imcontext->input && imcontext->text_input) { - SECURE_LOGD ("ctx : %p, prediction_hint : %s\n", ctx, imcontext->prediction_hint); + SECURE_LOGD ("ctx : %p, prediction_hint : %s", ctx, imcontext->prediction_hint); wl_text_input_prediction_hint(imcontext->text_input, imcontext->prediction_hint); } } @@ -3515,7 +3515,7 @@ wayland_im_context_mime_type_accept_set (Ecore_IMF_Context *ctx, const char *mim imcontext->mime_type = strdup(mime_type); if (imcontext->input && imcontext->text_input && (strlen(mime_type) > 0)) { - LOGD ("ctx : %p, mime_type : %s\n", ctx, imcontext->mime_type); + LOGD ("ctx : %p, mime_type : %s", ctx, imcontext->mime_type); wl_text_input_set_mime_type(imcontext->text_input, imcontext->mime_type); } } @@ -3532,7 +3532,7 @@ wayland_im_context_input_panel_position_set (Ecore_IMF_Context *ctx, int x, int } if (imcontext->input && imcontext->text_input) { - LOGD ("ctx : %p, x = %d, y = %d\n", ctx, x, y); + LOGD ("ctx : %p, x = %d, y = %d", ctx, x, y); wl_text_input_set_input_panel_position(imcontext->text_input, imcontext->input_panel_position.x, imcontext->input_panel_position.y); } diff --git a/ism/modules/config/scim_socket_config.cpp b/ism/modules/config/scim_socket_config.cpp index d628f02..7629149 100644 --- a/ism/modules/config/scim_socket_config.cpp +++ b/ism/modules/config/scim_socket_config.cpp @@ -133,7 +133,7 @@ SocketConfig::read (const String& key, String *pStr) const trans.get_data (*pStr) && trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK) return true; - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } LOGW ("Failed, reconnect again"); @@ -169,7 +169,7 @@ SocketConfig::read (const String& key, int *pl) const *pl = val; return true; } - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } LOGW ("Failed, reconnect again"); @@ -206,7 +206,7 @@ SocketConfig::read (const String& key, double* val) const *val = strtod (str.c_str (), NULL); return true; } - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } LOGW ("Failed, reconnect again"); @@ -243,7 +243,7 @@ SocketConfig::read (const String& key, bool* val) const *val = (bool)tmp; return true; } - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } LOGW ("Failed, reconnect again"); @@ -280,7 +280,7 @@ SocketConfig::read (const String& key, std::vector * val) const trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK) { return true; } - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } LOGW ("Failed, reconnect again"); @@ -319,7 +319,7 @@ SocketConfig::read (const String& key, std::vector * val) const val->push_back ((int) vec[i]); return true; } - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } LOGW ("Failed, reconnect again"); @@ -615,12 +615,12 @@ SocketConfig::open_connection () const if (m_socket_client.connect (socket_address)) break; scim_usleep (100000); - LOGW (" Re-connecting to ISF(scim) server. SocketConfig connect count : %d\n", i+1); + LOGW (" Re-connecting to ISF(scim) server. SocketConfig connect count : %d", i+1); } } if (!m_socket_client.is_connected ()) { - LOGW (" Cannot connect to SocketServer (%s).\n", m_socket_address.c_str ()); + LOGW (" Cannot connect to SocketServer (%s).", m_socket_address.c_str ()); return false; } @@ -631,11 +631,11 @@ SocketConfig::open_connection () const m_socket_client, m_socket_timeout)) { m_socket_client.close (); - LOGE (" Connect to SocketServer (%s) failed.\n", m_socket_address.c_str ()); + LOGE (" Connect to SocketServer (%s) failed.", m_socket_address.c_str ()); return false; } - LOGD (" Connect to SocketServer (%s).\n", m_socket_address.c_str ()); + LOGD (" Connect to SocketServer (%s).", m_socket_address.c_str ()); m_connected = true; gettimeofday (&m_update_timestamp, 0); return true; diff --git a/ism/modules/frontend/scim_socket_frontend.cpp b/ism/modules/frontend/scim_socket_frontend.cpp index 4de153c..838a32c 100644 --- a/ism/modules/frontend/scim_socket_frontend.cpp +++ b/ism/modules/frontend/scim_socket_frontend.cpp @@ -224,10 +224,10 @@ void SocketFrontEnd::launch_helper (const char *name, const char *appid, const c 0}; SCIM_DEBUG_MAIN (2) << " Call scim-helper-launcher.\n"; - ISF_SAVE_LOG ("Exec scim_helper_launcher(%s %s)\n", name, appid); + ISF_SAVE_LOG ("Exec scim_helper_launcher(%s %s)", name, appid); setsid (); - LOGD ("launch execpath : %s\n", scim_helper_path.c_str ()); + LOGD ("launch execpath : %s", scim_helper_path.c_str ()); execv (scim_helper_path.c_str (), const_cast(argv)); exit (-1); } @@ -240,33 +240,33 @@ void SocketFrontEnd::app_control_launch (const char *app_id) ret = app_control_create (&app_control); if (ret != APP_CONTROL_ERROR_NONE) { - LOGW ("app_control_create returned %d\n", ret); + LOGW ("app_control_create returned %d", ret); return; } ret = app_control_set_operation (app_control, APP_CONTROL_OPERATION_DEFAULT); if (ret != APP_CONTROL_ERROR_NONE) { - LOGW ("app_control_set_operation returned %d\n", ret); + LOGW ("app_control_set_operation returned %d", ret); app_control_destroy (app_control); return; } ret = app_control_set_app_id (app_control, app_id); if (ret != APP_CONTROL_ERROR_NONE) { - LOGW ("app_control_set_app_id returned %d\n", ret); + LOGW ("app_control_set_app_id returned %d", ret); app_control_destroy (app_control); return; } ret = app_control_send_launch_request (app_control, NULL, NULL); if (ret != APP_CONTROL_ERROR_NONE) { - LOGW ("app_control_send_launch_request returned %d, app_id=%s\n", ret, app_id); + LOGW ("app_control_send_launch_request returned %d, app_id=%s", ret, app_id); app_control_destroy (app_control); return; } app_control_destroy (app_control); - LOGD ("Launch %s\n", app_id); + LOGD ("Launch %s", app_id); } void SocketFrontEnd::run_helper (const Socket &client) @@ -283,7 +283,7 @@ void SocketFrontEnd::run_helper (const Socket &client) m_send_trans.put_command (SCIM_TRANS_CMD_FAIL); return; } - ISF_SAVE_LOG ("uuid(%s), config(%s), display(%s)\n", uuid.c_str (), config.c_str (), display.c_str ()); + ISF_SAVE_LOG ("uuid(%s), config(%s), display(%s)", uuid.c_str (), config.c_str (), display.c_str ()); #ifdef HAVE_PKGMGR_INFO char *execpath = NULL; @@ -298,7 +298,7 @@ void SocketFrontEnd::run_helper (const Socket &client) ret = pkgmgrinfo_appinfo_get_usr_appinfo (uuid.c_str (), getuid (), &appinfo_handle); if (ret != PMINFO_R_OK) { - LOGW ("pkgmgrinfo_appinfo_get_appinfo () & get_usr_appinfo () failed. appid : %s, ret : %d \n", uuid.c_str (), ret); + LOGW ("pkgmgrinfo_appinfo_get_appinfo () & get_usr_appinfo () failed. appid : %s, ret : %d", uuid.c_str (), ret); return; } } @@ -310,7 +310,7 @@ void SocketFrontEnd::run_helper (const Socket &client) return; } - LOGD ("exec path : %s\n", execpath); + LOGD ("exec path : %s", execpath); scim_helper_path = String (execpath); if (appinfo_handle) { @@ -338,7 +338,7 @@ void SocketFrontEnd::run_helper (const Socket &client) } if (i > 0 && i == __helpers.size ()) { - ISF_SAVE_LOG ("Can't find and exec scim_helper_launcher appid=\"%s\"\n", uuid.c_str ()); + ISF_SAVE_LOG ("Can't find and exec scim_helper_launcher appid=\"%s\"", uuid.c_str ()); m_send_trans.put_command (SCIM_TRANS_CMD_FAIL); } else @@ -2118,7 +2118,7 @@ SocketFrontEnd::socket_update_ise_list (int /*client_id*/) if (m_receive_trans.get_data (strName) && strName.length () > 0) { //std::cout << "ISE name list:" << strName << "\n"; //scim_split_string_list (name_list, strName); - LOGD ("%s\n", strName.c_str ()); + LOGD ("%s", strName.c_str ()); /* The strName has all appids but here module name is necessary. */ HelperInfo info; std::vector ime_info; diff --git a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp index 8d6c6cf..53c8d25 100644 --- a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp +++ b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp @@ -77,9 +77,9 @@ void aul_wakeup_ime_application(int sockfd) socklen_t len = sizeof(struct ucred); if (getsockopt(sockfd, SOL_SOCKET, SO_PEERCRED, &ucred, &len) == 0) { int ret = aul_update_freezer_status((long)ucred.pid, "wakeup"); - LOGD("aul_update_freezer_status : %d %d\n", ucred.pid, ret); + LOGD("aul_update_freezer_status : %d %d", ucred.pid, ret); } else { - LOGD("getsockopt failed : %d\n", errno); + LOGD("getsockopt failed : %d", errno); } } #define DEFAULT_CONTEXT_VALUE 0xfff @@ -144,7 +144,7 @@ public: _read_handler_list.push_back(panel_agent_read_handler); return true; } - LOGE("create server failed\n"); + LOGE("create server failed"); return false; } @@ -165,7 +165,7 @@ public: } private: void update_panel_event(int client, uint32 context_id, int cmd, uint32 nType, uint32 nValue) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); @@ -178,7 +178,7 @@ private: void move_preedit_caret(int client, uint32 context_id, uint32 position) { SCIM_DEBUG_MAIN(1) << "PanelAgent::move_preedit_caret (" << position << ")\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); @@ -214,7 +214,7 @@ private: #endif void reset_keyboard_ise(int client, uint32 context_id) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); @@ -224,7 +224,7 @@ private: } void update_keyboard_ise_list(int client, uint32 context) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -236,7 +236,7 @@ private: void change_factory(int client, uint32 context, const String& uuid) { SCIM_DEBUG_MAIN(1) << "PanelAgent::change_factory (" << uuid << ")\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -249,7 +249,7 @@ private: void helper_candidate_show(int client, uint32 context, const String& uuid) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -262,7 +262,7 @@ private: } void helper_candidate_hide(int client, uint32 context, const String& uuid) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -276,7 +276,7 @@ private: void candidate_more_window_show(int client, uint32 context) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -291,7 +291,7 @@ private: void candidate_more_window_hide(int client, uint32 context) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -306,7 +306,7 @@ private: void update_helper_lookup_table(int client, uint32 context, const String& uuid, const LookupTable& table) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -321,7 +321,7 @@ private: void select_aux(int client, uint32 contextid, uint32 item) { SCIM_DEBUG_MAIN(1) << "PanelAgent::select_aux (" << item << ")\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -337,7 +337,7 @@ private: } void select_candidate(int client, uint32 context, uint32 item) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -354,7 +354,7 @@ private: void lookup_table_page_up(int client, uint32 context) { SCIM_DEBUG_MAIN(1) << "PanelAgent::lookup_table_page_up ()\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -369,7 +369,7 @@ private: } void lookup_table_page_down(int client, uint32 context) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -384,7 +384,7 @@ private: } void update_lookup_table_page_size(int client, uint32 context, uint32 size) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -400,7 +400,7 @@ private: } void update_candidate_item_layout(int client, uint32 context, const std::vector& row_items) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -416,7 +416,7 @@ private: } void select_associate(int client, uint32 context, uint32 item) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -432,7 +432,7 @@ private: } void associate_table_page_up(int client, uint32 context) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -447,7 +447,7 @@ private: } void associate_table_page_down(int client, uint32 context) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -462,7 +462,7 @@ private: } void update_associate_table_page_size(int client, uint32 context, uint32 size) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -478,7 +478,7 @@ private: } void update_displayed_candidate_number(int client, uint32 context, uint32 size) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -494,7 +494,7 @@ private: } void send_longpress_event(int client, uint32 context, int index) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -510,7 +510,7 @@ private: } void trigger_property(int client, uint32 context, const String& property) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -526,7 +526,7 @@ private: } void focus_out_helper(int client, uint32 context, const String& uuid) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -538,7 +538,7 @@ private: } void focus_in_helper(int client, uint32 context, const String& uuid) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -550,7 +550,7 @@ private: } void show_helper(int client, uint32 context, const String& uuid, char* data, size_t& len) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -566,7 +566,7 @@ private: } void hide_helper(int client, uint32 context, const String& uuid) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -578,7 +578,7 @@ private: } void set_helper_mode(int client, uint32 context, const String& uuid, uint32& mode) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -591,7 +591,7 @@ private: } void set_helper_language(int client, uint32 context, const String& uuid, uint32& language) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -604,7 +604,7 @@ private: } void set_helper_imdata(int client, uint32 context, const String& uuid, const char* imdata, size_t& len) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -617,7 +617,7 @@ private: } void set_helper_return_key_type(int client, uint32 context, const String& uuid, uint32 type) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -630,7 +630,7 @@ private: } void get_helper_return_key_type(int client, uint32 context, const String& uuid, _OUT_ uint32& type) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); Transaction trans; @@ -649,12 +649,12 @@ private: SCIM_DEBUG_MAIN(1) << __func__ << " success\n"; } else { - LOGW ("read failed\n"); + LOGW ("read failed"); } } void set_helper_return_key_disable(int client, uint32 context, const String& uuid, uint32 disabled) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -692,7 +692,7 @@ private: } void set_helper_layout(int client, uint32 context, const String& uuid, uint32& layout) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -705,7 +705,7 @@ private: } void set_helper_input_mode(int client, uint32 context, const String& uuid, uint32& mode) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -718,7 +718,7 @@ private: } void set_helper_input_hint(int client, uint32 context, const String& uuid, uint32& hint) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -731,7 +731,7 @@ private: } void set_helper_bidi_direction(int client, uint32 context, const String& uuid, uint32& direction) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -744,7 +744,7 @@ private: } void set_helper_caps_mode(int client, uint32 context, const String& uuid, uint32& mode) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -757,7 +757,7 @@ private: } void show_helper_option_window(int client, uint32 context, const String& uuid) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -772,7 +772,7 @@ private: } void resume_helper_option_window(int client, uint32 context, const String& uuid) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -787,7 +787,7 @@ private: } void set_helper_keyboard_mode(int client, uint32 context, const String& uuid, uint32& mode) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -800,7 +800,7 @@ private: } void set_helper_prediction_hint(int client, uint32 context, const String& uuid, String& prediction_hint) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -813,7 +813,7 @@ private: } void set_helper_mime_type(int client, uint32 context, const String& uuid, String& mime_type) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -826,7 +826,7 @@ private: } void finalize_content_helper(int client, uint32 context, const String& uuid, String& text, uint32& cursor_pos) { - LOGD("client id:%d\n", client); + LOGD("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -840,7 +840,7 @@ private: } bool process_key_event(int client, uint32 context, const String& uuid, KeyEvent& key, uint32 serial) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -858,14 +858,14 @@ private: SCIM_DEBUG_MAIN(1) << __func__ << " success\n"; return true; } else { - LOGW ("read failed\n"); + LOGW ("read failed"); } return false; } bool get_helper_geometry(int client, uint32 context, String& uuid, _OUT_ struct rectinfo& info) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -890,15 +890,15 @@ private: SCIM_DEBUG_MAIN(1) << __func__ << " is successful\n"; return true; } else - LOGW ("read failed\n"); + LOGW ("read failed"); } else - LOGW ("write failed\n"); + LOGW ("write failed"); return false; } void get_helper_imdata(int client, uint32 context, String& uuid, char** imdata, size_t& len) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); Transaction trans; @@ -916,12 +916,12 @@ private: trans.get_data(imdata, len); LOGD ("length of imdata is %d", len); } else { - LOGW ("read imdata failed\n"); + LOGW ("read imdata failed"); } } void get_helper_layout(int client, uint32 context, String& uuid, uint32& layout) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -940,12 +940,12 @@ private: && trans.get_data(layout)) { SCIM_DEBUG_MAIN(1) << "get_helper_layout success\n"; } else - LOGW ("failed\n"); + LOGW ("failed"); } void get_ise_language_locale(int client, uint32 context, String& uuid, char** data, size_t& len) { SCIM_DEBUG_MAIN(4) << __func__ << "\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Transaction trans; @@ -963,12 +963,12 @@ private: && trans.get_command(cmd) && cmd == SCIM_TRANS_CMD_REPLY && trans.get_data(data, len)) { } else { - LOGW ("failed\n"); + LOGW ("failed"); } } void check_option_window(int client, uint32 context, String& uuid, _OUT_ uint32& avail) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); int cmd; Socket client_socket(client); @@ -985,12 +985,12 @@ private: if (!trans.read_from_socket(client_socket, m_socket_timeout) || !trans.get_command(cmd) || cmd != SCIM_TRANS_CMD_REPLY || !trans.get_data(avail)) { - LOGW ("ISM_TRANS_CMD_CHECK_OPTION_WINDOW failed\n"); + LOGW ("ISM_TRANS_CMD_CHECK_OPTION_WINDOW failed"); } } void reset_ise_option(int client, uint32 context) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -1001,7 +1001,7 @@ private: } void reset_helper_context(int client, uint32 context, const String& uuid) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Transaction trans; Socket client_socket(client); m_send_trans.clear(); @@ -1014,7 +1014,7 @@ private: void reload_config(int client) { SCIM_DEBUG_MAIN(1) << "PanelAgent::reload_config ()\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); @@ -1026,7 +1026,7 @@ private: void exit(int client, uint32 context) { SCIM_DEBUG_MAIN(1) << "PanelAgent::exit ()\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); @@ -1045,7 +1045,7 @@ private: } bool process_input_device_event(int client, uint32 context, const String& uuid, uint32 type, const char *data, size_t len, _OUT_ uint32& result) { - LOGD("client id:%d\n", client); + LOGD("client id:%d", client); Socket client_socket(client); @@ -1064,7 +1064,7 @@ private: return true; } else { - LOGW("read failed\n"); + LOGW("read failed"); } return false; @@ -1072,7 +1072,7 @@ private: void socket_update_surrounding_text(int client, uint32 context, const String& uuid, String& text, uint32 cursor) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -1093,7 +1093,7 @@ private: void socket_remoteinput_focus_in (int client) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); bool ret; ret = (client == -1) ? false : true; @@ -1110,7 +1110,7 @@ private: void socket_remoteinput_focus_out (int client) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); bool ret; ret = (client == -1) ? false : true; @@ -1127,7 +1127,7 @@ private: void socket_remoteinput_entry_metadata (int client, uint32 hint, uint32 layout, int variation, uint32 autocapital_type, int return_key_disabled) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); bool ret; ret = (client == -1) ? false : true; @@ -1149,7 +1149,7 @@ private: void socket_remoteinput_surrounding_text (int client, String& text, uint32 cursor) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); bool ret; ret = (client == -1) ? false : true; @@ -1168,7 +1168,7 @@ private: void socket_remoteinput_input_resource (int client, uint32 input_resource) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << "...\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); bool ret; ret = (client == -1) ? false : true; @@ -1185,7 +1185,7 @@ private: } void socket_update_selection(int client, uint32 context, String& uuid, String text) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -1204,7 +1204,7 @@ private: } void socket_get_keyboard_ise_list(int client, uint32 context, const String& uuid, std::vector& list) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); m_send_trans.clear(); @@ -1223,7 +1223,7 @@ private: void socket_get_candidate_ui(int client, uint32 context, const String& uuid, int style, int mode) { SCIM_DEBUG_MAIN(4) << "PanelAgent::socket_get_candidate_ui ()\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); m_send_trans.clear(); @@ -1239,7 +1239,7 @@ private: void socket_get_candidate_geometry(int client, uint32 context, const String& uuid, struct rectinfo& info) { SCIM_DEBUG_MAIN(4) << __func__ << " \n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); m_send_trans.clear(); @@ -1255,7 +1255,7 @@ private: } void socket_get_keyboard_ise(int client, uint32 context, const String& uuid, String& ise_name, String& ise_uuid) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); m_send_trans.clear(); @@ -1271,7 +1271,7 @@ private: void socket_start_helper(int client, uint32 context, const String& ic_uuid) { SCIM_DEBUG_MAIN(4) << "PanelAgent::socket_start_helper ()\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -1285,7 +1285,7 @@ private: void helper_detach_input_context(int client, uint32 context, const String& ic_uuid) { SCIM_DEBUG_MAIN(4) << "PanelAgent::socket_stop_helper ()\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -1298,7 +1298,7 @@ private: void helper_process_imengine_event(int client, uint32 context, const String& ic_uuid, const Transaction& _nest_trans) { SCIM_DEBUG_MAIN(4) << "PanelAgent::socket_send_helper_event ()\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); @@ -1320,7 +1320,7 @@ private: } void process_helper_event(int client, uint32 context, String target_uuid, String active_uuid, Transaction& nest_trans) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); SCIM_DEBUG_MAIN(4) << "PanelAgent::socket_helper_send_imengine_event (" << client << ")\n"; Socket socket_client(client); @@ -1337,7 +1337,7 @@ private: } void socket_helper_key_event(int client, uint32 context, int cmd, KeyEvent& key) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1351,7 +1351,7 @@ private: } void commit_string(int client, uint32 target_context, const WideString& wstr) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1366,7 +1366,7 @@ private: void socket_helper_get_surrounding_text(int client, uint32 context_id, uint32 maxlen_before, uint32 maxlen_after) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << " (" << client << ")\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1382,7 +1382,7 @@ private: void socket_helper_delete_surrounding_text(int client, uint32 context_id, uint32 offset, uint32 len) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << " (" << client << ")\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1398,7 +1398,7 @@ private: void socket_helper_get_selection(int client, uint32 context_id) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << " (" << client << ")\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); @@ -1412,7 +1412,7 @@ private: } void socket_helper_set_selection(int client, uint32 context_id, uint32 start, uint32 end) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1427,7 +1427,7 @@ private: } void show_preedit_string(int client, uint32 target_context) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1440,7 +1440,7 @@ private: } void hide_preedit_string(int client, uint32 target_context) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1453,7 +1453,7 @@ private: } void update_preedit_string(int client, uint32 target_context, WideString preedit, WideString commit, AttributeList& attrs, uint32 caret) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1470,7 +1470,7 @@ private: } void update_preedit_caret(int client, uint32 focused_context, uint32 caret) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1484,7 +1484,7 @@ private: } void helper_attach_input_context_and_update_screen(int client, std::vector < std::pair >& helper_ic_index, uint32 current_screen) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); m_send_trans.clear(); @@ -1503,7 +1503,7 @@ private: } void update_ise_input_context(int client, uint32 focused_context, uint32 type, uint32 value) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket(client); m_send_trans.clear(); @@ -1516,7 +1516,7 @@ private: } void send_private_command(int client, uint32 focused_context, String command) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1529,7 +1529,7 @@ private: } void commit_content(int client, uint32 focused_context, String content, String description, String mime_types) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1544,7 +1544,7 @@ private: } void helper_all_update_spot_location(int client, uint32 context_id, String uuid, int x, int y) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); @@ -1563,7 +1563,7 @@ private: } void helper_all_update_cursor_position(int client, uint32 context_id, String uuid, int cursor_pos) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); @@ -1577,7 +1577,7 @@ private: } void helper_all_update_screen(int client, uint32 context_id, String uuid, int screen) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); @@ -1595,7 +1595,7 @@ private: } void set_autocapital_type(int client, uint32 context, String uuid, int mode) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); @@ -1610,7 +1610,7 @@ private: } void remote_update_preedit_string (int client, uint32 target_context, const WideString str, const WideString commit, const AttributeList &attrs, uint32 caret) { - LOGD("client id:%d\n", client); + LOGD("client id:%d", client); Socket client_socket(client); lock(); @@ -1627,7 +1627,7 @@ private: } void remote_send_key_event (int client, uint32 target_context, const KeyEvent &key) { - LOGD("client id:%d\n", client); + LOGD("client id:%d", client); Socket client_socket(client); lock(); @@ -1641,7 +1641,7 @@ private: } void remote_forward_key_event (int client, uint32 target_context, const KeyEvent &key) { - LOGD("client id:%d\n", client); + LOGD("client id:%d", client); Socket client_socket(client); lock(); @@ -1655,7 +1655,7 @@ private: } void remote_commit_string (int client, uint32 target_context, const WideString& wstr) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1670,7 +1670,7 @@ private: void remote_delete_surrounding_text (int client, uint32 context_id, uint32 offset, uint32 len) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << " (" << client << ")\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket socket_client(client); lock(); @@ -1685,7 +1685,7 @@ private: } void set_prediction_allow (int client, uint32 context, String uuid, int mode) { - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); m_send_trans.clear(); m_send_trans.put_command(SCIM_TRANS_CMD_REPLY); @@ -1702,7 +1702,7 @@ private: void send_fail_reply (int client) { SCIM_DEBUG_MAIN(4) << __FUNCTION__ << " (" << client << ")\n"; - LOGD ("client id:%d\n", client); + LOGD ("client id:%d", client); Socket client_socket (client); Transaction trans; @@ -1743,9 +1743,9 @@ private: return true; if (nbytes < 0) { - LOGW ("Error occurred when reading socket: %s\n", client.get_error_message().c_str()); + LOGW ("Error occurred when reading socket: %s", client.get_error_message().c_str()); } else { - LOGW ("Timeout when reading socket\n"); + LOGW ("Timeout when reading socket"); } return false; @@ -1776,7 +1776,7 @@ private: ::close (fd); ecore_main_fd_handler_del(fd_handler); - ISF_SAVE_LOG("_panel_agent->filter_event (fd=%d) is failed!!!\n", fd); + ISF_SAVE_LOG("_panel_agent->filter_event (fd=%d) is failed!!!", fd); } return ECORE_CALLBACK_RENEW; @@ -1788,7 +1788,7 @@ private: ::close (fd); ecore_main_fd_handler_del(fd_handler); - ISF_SAVE_LOG("Received exception event (fd=%d)!!!\n", fd); + ISF_SAVE_LOG("Received exception event (fd=%d)!!!", fd); return ECORE_CALLBACK_RENEW; } @@ -1824,7 +1824,7 @@ private: /* If the connection is closed then close this client. */ if (!socket_check_client_connection(client)) { - LOGW ("check client connection failed\n"); + LOGW ("check client connection failed"); socket_close_connection(server, client); return; } @@ -1844,7 +1844,7 @@ private: if (!m_recv_trans.read_from_socket(client, m_socket_timeout) || !m_recv_trans.get_command(cmd) || cmd != SCIM_TRANS_CMD_REQUEST || !m_recv_trans.get_data(key) || key != (uint32) client_info.key) { - LOGW ("cmd:%d key:%d client info key: %d\n", cmd, key, client_info.key); + LOGW ("cmd:%d key:%d client info key: %d", cmd, key, client_info.key); return; } @@ -1854,7 +1854,7 @@ private: socket_transaction_start(); while (m_recv_trans.get_command(cmd)) { - LOGD ("PanelAgent::cmd = %d\n", cmd); + LOGD ("PanelAgent::cmd = %d", cmd); if (cmd == ISM_TRANS_CMD_REGISTER_PANEL_CLIENT) { uint32 id = 0; @@ -1862,7 +1862,7 @@ private: if (m_recv_trans.get_data(id)) { m_info_manager->register_panel_client(client_id, id); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -1871,7 +1871,7 @@ private: if (m_recv_trans.get_data(uuid)) { m_info_manager->register_input_context(client_id, context, uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -1890,7 +1890,7 @@ private: if (m_recv_trans.get_data(uuid)) { m_info_manager->focus_in(client_id, context, uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -1901,7 +1901,7 @@ private: if (m_recv_trans.get_data(isOn)) { m_info_manager->socket_turn_on_log(isOn); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -1922,7 +1922,7 @@ private: if (m_recv_trans.get_data(client) && m_recv_trans.get_data(context) && m_recv_trans.get_data(&data, len)) { ret = true; } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } Transaction trans; @@ -1948,7 +1948,7 @@ private: if (m_recv_trans.get_data(client) && m_recv_trans.get_data(context)) { m_info_manager->hide_ise_panel(client_id, client, context); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2010,7 +2010,7 @@ private: if (m_recv_trans.get_data(language)) { m_info_manager->set_ise_language(client_id, language); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2021,7 +2021,7 @@ private: if (m_recv_trans.get_data(&imdata, len)) { m_info_manager->set_ise_imdata(client_id, imdata, len); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } if (NULL != imdata) @@ -2057,7 +2057,7 @@ private: if (m_recv_trans.get_data(type)) { m_info_manager->set_ise_return_key_type(client_id, type); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2085,7 +2085,7 @@ private: if (m_recv_trans.get_data(disabled)) { m_info_manager->set_ise_return_key_disable(client_id, disabled); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2132,7 +2132,7 @@ private: if (m_recv_trans.get_data(layout)) { m_info_manager->set_ise_layout(client_id, layout); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2142,7 +2142,7 @@ private: if (m_recv_trans.get_data(mode)) { m_info_manager->set_ise_caps_mode(client_id, mode); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2158,7 +2158,7 @@ private: if (m_recv_trans.get_data(mode)) { m_info_manager->set_keyboard_mode(client_id, mode); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2175,7 +2175,7 @@ private: ret = true; m_info_manager->process_key_event(key, result); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } Transaction trans; @@ -2224,7 +2224,7 @@ private: if (m_recv_trans.get_data(input_mode)) { m_info_manager->set_ise_input_mode(client_id, input_mode); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2234,7 +2234,7 @@ private: if (m_recv_trans.get_data(input_hint)) { m_info_manager->set_ise_input_hint(client_id, input_hint); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2244,7 +2244,7 @@ private: if (m_recv_trans.get_data(bidi_direction)) { m_info_manager->update_ise_bidi_direction(client_id, bidi_direction); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2265,7 +2265,7 @@ private: if (m_recv_trans.get_data(uuid) && uuid.length()) { m_info_manager->socket_start_helper(client_id, context, uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2276,7 +2276,7 @@ private: uuid.length() && m_nest_trans.valid()) { m_info_manager->socket_send_helper_event(client_id, context, uuid, m_nest_trans); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2286,7 +2286,7 @@ private: if (m_recv_trans.get_data(uuid) && uuid.length()) { m_info_manager->socket_stop_helper(client_id, context, uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } continue; @@ -2306,14 +2306,14 @@ private: if (m_recv_trans.get_data(num)) m_info_manager->socket_update_screen(client_id, num); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == SCIM_TRANS_CMD_UPDATE_SPOT_LOCATION) { uint32 x, y, top_y; if (m_recv_trans.get_data(x) && m_recv_trans.get_data(y) && m_recv_trans.get_data(top_y)) { m_info_manager->socket_update_spot_location(x, y, top_y); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_UPDATE_CURSOR_POSITION) { uint32 cursor_pos; @@ -2321,7 +2321,7 @@ private: if (m_recv_trans.get_data(cursor_pos)) { m_info_manager->socket_update_cursor_position(cursor_pos); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_UPDATE_SURROUNDING_TEXT) { String text; @@ -2330,7 +2330,7 @@ private: if (m_recv_trans.get_data(text) && m_recv_trans.get_data(cursor)) { m_info_manager->socket_update_surrounding_text(text, cursor); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_UPDATE_SELECTION) { String text; @@ -2338,7 +2338,7 @@ private: if (m_recv_trans.get_data(text)) { m_info_manager->socket_update_selection(text); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_EXPAND_CANDIDATE) m_info_manager->expand_candidate(); @@ -2350,7 +2350,7 @@ private: if (m_recv_trans.get_data(portrait_line) && m_recv_trans.get_data(mode)) m_info_manager->socket_set_candidate_ui(portrait_line, mode); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == SCIM_TRANS_CMD_PANEL_UPDATE_FACTORY_INFO) { PanelFactoryInfo info; @@ -2358,7 +2358,7 @@ private: m_recv_trans.get_data(info.lang) && m_recv_trans.get_data(info.icon)) { m_info_manager->socket_update_factory_info(info); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_SHOW_PREEDIT_STRING) m_info_manager->socket_show_preedit_string(); @@ -2384,14 +2384,14 @@ private: if (m_recv_trans.get_data(str) && m_recv_trans.get_data(attrs) && m_recv_trans.get_data(caret)) m_info_manager->socket_update_preedit_string(str, attrs, caret); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == SCIM_TRANS_CMD_UPDATE_PREEDIT_CARET) { uint32 caret; if (m_recv_trans.get_data(caret)) m_info_manager->socket_update_preedit_caret(caret); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == SCIM_TRANS_CMD_UPDATE_AUX_STRING) { String str; AttributeList attrs; @@ -2399,7 +2399,7 @@ private: if (m_recv_trans.get_data(str) && m_recv_trans.get_data(attrs)) m_info_manager->socket_update_aux_string(str, attrs); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == ISM_TRANS_CMD_RECAPTURE_STRING) { uint32 target_ic; String target_uuid; @@ -2418,7 +2418,7 @@ private: m_recv_trans.get_data(attrs)) { m_info_manager->socket_helper_recapture_string(client_id, target_ic, target_uuid, offset, len, preedit, commit, attrs); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_UPDATE_LOOKUP_TABLE) { CommonLookupTable _isf_candidate_table; @@ -2426,7 +2426,7 @@ private: if (m_recv_trans.get_data(_isf_candidate_table)) m_info_manager->socket_update_lookup_table(_isf_candidate_table); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == ISM_TRANS_CMD_UPDATE_ASSOCIATE_TABLE) { CommonLookupTable table; @@ -2434,28 +2434,28 @@ private: if (m_recv_trans.get_data(table)) m_info_manager->socket_update_associate_table(table); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == SCIM_TRANS_CMD_REGISTER_PROPERTIES) { PropertyList properties; if (m_recv_trans.get_data(properties)) m_info_manager->socket_register_properties(properties); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == SCIM_TRANS_CMD_UPDATE_PROPERTY) { Property property; if (m_recv_trans.get_data(property)) m_info_manager->socket_update_property(property); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == SCIM_TRANS_CMD_PANEL_SHOW_HELP) { String help; if (m_recv_trans.get_data(help)) m_info_manager->socket_show_help(help); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == SCIM_TRANS_CMD_PANEL_SHOW_FACTORY_MENU) { PanelFactoryInfo info; std::vector vec; @@ -2470,7 +2470,7 @@ private: } else if (cmd == SCIM_TRANS_CMD_FOCUS_OUT) { m_info_manager->focus_out(client_id, context); } else { - LOGW ("unknown cmd: %d\n", cmd); + LOGW ("unknown cmd: %d", cmd); } } @@ -2482,7 +2482,7 @@ private: socket_transaction_start(); while (m_recv_trans.get_command(cmd)) { - LOGD ("PanelAgent::cmd = %d\n", cmd); + LOGD ("PanelAgent::cmd = %d", cmd); if (cmd == ISM_TRANS_CMD_GET_PANEL_CLIENT_ID) { Socket client_socket(client_id); @@ -2495,7 +2495,7 @@ private: trans.write_to_socket(client_socket); continue; } else { - LOGW ("unknown cmd: %d\n", cmd); + LOGW ("unknown cmd: %d", cmd); } } @@ -2505,7 +2505,7 @@ private: socket_transaction_start(); while (m_recv_trans.get_command(cmd)) { - LOGD ("PanelAgent::cmd = %d\n", cmd); + LOGD ("PanelAgent::cmd = %d", cmd); if (cmd == SCIM_TRANS_CMD_PANEL_REGISTER_HELPER) { HelperInfo info; @@ -2519,7 +2519,7 @@ private: m_info_manager->socket_helper_register_helper(client_id, info); } } else { - LOGW ("unknown cmd: %d\n", cmd); + LOGW ("unknown cmd: %d", cmd); } } @@ -2528,7 +2528,7 @@ private: socket_transaction_start(); while (m_recv_trans.get_command(cmd)) { - LOGD ("PanelAgent::cmd = %d\n", cmd); + LOGD ("PanelAgent::cmd = %d", cmd); if (cmd == SCIM_TRANS_CMD_PANEL_REGISTER_ACTIVE_HELPER) { HelperInfo info; @@ -2541,7 +2541,7 @@ private: info.uuid.length()) { m_info_manager->socket_helper_register_helper_passive(client_id, info); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } /* Check whether application already requested the focus_in and showing input_panel @@ -2560,7 +2560,7 @@ private: wstr.length()) { m_info_manager->socket_helper_commit_string(client_id, target_ic, target_uuid, wstr); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_SHOW_PREEDIT_STRING) { uint32 target_ic; @@ -2569,7 +2569,7 @@ private: if (m_recv_trans.get_data(target_ic) && m_recv_trans.get_data(target_uuid)) { m_info_manager->socket_helper_show_preedit_string(client_id, target_ic, target_uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_SHOW_AUX_STRING) { m_info_manager->socket_show_aux_string(); @@ -2584,7 +2584,7 @@ private: if (m_recv_trans.get_data(target_ic) && m_recv_trans.get_data(target_uuid)) { m_info_manager->socket_helper_hide_preedit_string(client_id, target_ic, target_uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_HIDE_AUX_STRING) { m_info_manager->socket_hide_aux_string(); @@ -2608,7 +2608,7 @@ private: m_recv_trans.get_data(caret)) { m_info_manager->socket_helper_update_preedit_string(client_id, target_ic, target_uuid, preedit, commit, attrs, caret); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_UPDATE_PREEDIT_CARET) { uint32 caret; @@ -2616,7 +2616,7 @@ private: if (m_recv_trans.get_data(caret)) { m_info_manager->socket_helper_update_preedit_caret(client_id, caret); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_UPDATE_AUX_STRING) { String str; @@ -2625,14 +2625,14 @@ private: if (m_recv_trans.get_data(str) && m_recv_trans.get_data(attrs)) m_info_manager->socket_update_aux_string(str, attrs); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == SCIM_TRANS_CMD_UPDATE_LOOKUP_TABLE) { CommonLookupTable _isf_candidate_table; if (m_recv_trans.get_data(_isf_candidate_table)) { m_info_manager->socket_update_lookup_table(_isf_candidate_table); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_UPDATE_ASSOCIATE_TABLE) { CommonLookupTable _isf_candidate_table; @@ -2640,7 +2640,7 @@ private: if (m_recv_trans.get_data(_isf_candidate_table)) { m_info_manager->socket_update_associate_table(_isf_candidate_table); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_PROCESS_KEY_EVENT || cmd == SCIM_TRANS_CMD_PANEL_SEND_KEY_EVENT) { @@ -2654,7 +2654,7 @@ private: !key.empty()) { m_info_manager->socket_helper_send_key_event(client_id, target_ic, target_uuid, key); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_FORWARD_KEY_EVENT) { uint32 target_ic; @@ -2667,7 +2667,7 @@ private: !key.empty()) { m_info_manager->socket_helper_forward_key_event(client_id, target_ic, target_uuid, key); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_PANEL_SEND_IMENGINE_EVENT) { uint32 target_ic; @@ -2679,7 +2679,7 @@ private: m_nest_trans.valid()) { m_info_manager->socket_helper_send_imengine_event(client_id, target_ic, target_uuid, m_nest_trans); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_REGISTER_PROPERTIES) { PropertyList properties; @@ -2687,14 +2687,14 @@ private: if (m_recv_trans.get_data(properties)) m_info_manager->socket_helper_register_properties(client_id, properties); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == SCIM_TRANS_CMD_UPDATE_PROPERTY) { Property property; if (m_recv_trans.get_data(property)) m_info_manager->socket_helper_update_property(client_id, property); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == ISM_TRANS_CMD_UPDATE_ISE_INPUT_CONTEXT) { uint32 type; uint32 value; @@ -2702,7 +2702,7 @@ private: if (m_recv_trans.get_data(type) && m_recv_trans.get_data(value)) { m_info_manager->socket_helper_update_input_context(client_id, type, value); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_GET_KEYBOARD_ISE_LIST) { String uuid; @@ -2710,7 +2710,7 @@ private: if (m_recv_trans.get_data(uuid)) { m_info_manager->socket_get_keyboard_ise_list(uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_SET_CANDIDATE_UI) { uint32 portrait_line, mode; @@ -2718,14 +2718,14 @@ private: if (m_recv_trans.get_data(portrait_line) && m_recv_trans.get_data(mode)) m_info_manager->socket_set_candidate_ui(portrait_line, mode); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == ISM_TRANS_CMD_GET_CANDIDATE_UI) { String uuid; if (m_recv_trans.get_data(uuid)) { m_info_manager->socket_get_candidate_ui(uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_SET_CANDIDATE_POSITION) { uint32 left, top; @@ -2733,7 +2733,7 @@ private: if (m_recv_trans.get_data(left) && m_recv_trans.get_data(top)) m_info_manager->socket_set_candidate_position(left, top); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == ISM_TRANS_CMD_HIDE_CANDIDATE) { m_info_manager->socket_hide_candidate(); } else if (cmd == ISM_TRANS_CMD_GET_CANDIDATE_GEOMETRY) { @@ -2742,7 +2742,7 @@ private: if (m_recv_trans.get_data(uuid)) { m_info_manager->socket_get_candidate_geometry(uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_PANEL_RESET_KEYBOARD_ISE) { m_info_manager->reset_keyboard_ise(); @@ -2752,7 +2752,7 @@ private: if (m_recv_trans.get_data(uuid)) { m_info_manager->socket_set_keyboard_ise(uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_GET_KEYBOARD_ISE) { String uuid; @@ -2760,7 +2760,7 @@ private: if (m_recv_trans.get_data(uuid)) { m_info_manager->socket_get_keyboard_ise(uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_UPDATE_ISE_GEOMETRY) { uint32 x, y, width, height; @@ -2769,7 +2769,7 @@ private: m_recv_trans.get_data(width) && m_recv_trans.get_data(height)) { m_info_manager->socket_helper_update_ise_geometry(client_id, x, y, width, height); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_EXPAND_CANDIDATE) { m_info_manager->expand_candidate(); @@ -2781,7 +2781,7 @@ private: if (m_recv_trans.get_data(index)) m_info_manager->socket_helper_select_candidate(index); else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } else if (cmd == SCIM_TRANS_CMD_GET_SURROUNDING_TEXT) { String uuid; uint32 maxlen_before; @@ -2792,7 +2792,7 @@ private: m_recv_trans.get_data(maxlen_after)) { m_info_manager->socket_helper_get_surrounding_text(client_id, uuid, maxlen_before, maxlen_after); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_DELETE_SURROUNDING_TEXT) { uint32 offset; @@ -2801,7 +2801,7 @@ private: if (m_recv_trans.get_data(offset) && m_recv_trans.get_data(len)) { m_info_manager->socket_helper_delete_surrounding_text(client_id, offset, len); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_GET_SELECTION) { String uuid; @@ -2809,7 +2809,7 @@ private: if (m_recv_trans.get_data(uuid)) { m_info_manager->socket_helper_get_selection(client_id, uuid); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_SET_SELECTION) { uint32 start; @@ -2818,7 +2818,7 @@ private: if (m_recv_trans.get_data(start) && m_recv_trans.get_data(end)) { m_info_manager->socket_helper_set_selection(client_id, start, end); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == SCIM_TRANS_CMD_SEND_PRIVATE_COMMAND) { String command; @@ -2826,7 +2826,7 @@ private: if (m_recv_trans.get_data(command)) { m_info_manager->socket_helper_send_private_command(client_id, command); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } //FIXME: useless //} else if (cmd == ISM_TRANS_CMD_UPDATE_ISE_EXIT) { @@ -2841,7 +2841,7 @@ private: m_recv_trans.get_data(mime_types)) { m_info_manager->socket_helper_commit_content(client_id, content, description, mime_types); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_PROCESS_KEY_EVENT_DONE) { KeyEvent key; @@ -2851,7 +2851,7 @@ private: if (m_recv_trans.get_data(key) && m_recv_trans.get_data(ret) && m_recv_trans.get_data(serial)) { m_info_manager->process_key_event_done(key, ret, serial); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else if (cmd == ISM_TRANS_CMD_REQUEST_ISE_HIDE) { m_info_manager->request_ise_hide(); @@ -2873,10 +2873,10 @@ private: m_recv_trans.get_data(attrs)) { m_info_manager->socket_helper_recapture_string(client_id, target_ic, target_uuid, offset, len, preedit, commit, attrs); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } } else { - LOGW ("unknown cmd: %d\n", cmd); + LOGW ("unknown cmd: %d", cmd); } } @@ -2885,7 +2885,7 @@ private: socket_transaction_start(); while (m_recv_trans.get_command(cmd)) { - LOGD ("PanelAgent::cmd = %d\n", cmd); + LOGD ("PanelAgent::cmd = %d", cmd); if (cmd == ISM_TRANS_CMD_GET_ACTIVE_ISE) { if (m_info_manager->check_privilege_by_sockfd(client_id, IMEMANAGER_PRIVILEGE)) { @@ -2901,7 +2901,7 @@ private: trans.write_to_socket(client_socket); } else { - LOGW ("Access denied to get active ise\n"); + LOGW ("Access denied to get active ise"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_SET_ACTIVE_ISE_BY_UUID) { @@ -2913,7 +2913,7 @@ private: if (m_recv_trans.get_data(&buf, len)) { ret = m_info_manager->set_active_ise_by_uuid(client_id, buf, len); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } Transaction trans; @@ -2928,7 +2928,7 @@ private: delete[] buf; } else { - LOGW ("Access denied to set active ise\n"); + LOGW ("Access denied to set active ise"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_SET_INITIAL_ISE_BY_UUID) { @@ -2942,7 +2942,7 @@ private: if (m_recv_trans.get_data(&buf, len)) { m_info_manager->set_initial_ise_by_uuid(client_id, buf, len); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } Transaction trans; @@ -2957,7 +2957,7 @@ private: delete[] buf; } else { - LOGW ("Access denied to set initial ise\n"); + LOGW ("Access denied to set initial ise"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_GET_ISE_LIST) { @@ -2986,7 +2986,7 @@ private: trans.write_to_socket(client_socket); } else { - LOGW ("Access denied to get ise list\n"); + LOGW ("Access denied to get ise list"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_GET_ALL_HELPER_ISE_INFO) { @@ -3014,7 +3014,7 @@ private: } while (0); } else { - LOGW ("Access denied to get all helper ise info\n"); + LOGW ("Access denied to get all helper ise info"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_SET_ENABLE_HELPER_ISE_INFO) { @@ -3027,7 +3027,7 @@ private: m_info_manager->set_enable_helper_ise_info(client_id, appid, is_enabled); ret = true; } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } Transaction trans; @@ -3039,7 +3039,7 @@ private: trans.write_to_socket(client_socket); } else { - LOGW ("Access denied to set enable helper ise info\n"); + LOGW ("Access denied to set enable helper ise info"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_GET_ISE_INFORMATION) { @@ -3051,7 +3051,7 @@ private: if (m_recv_trans.get_data(strUuid)) { m_info_manager->get_ise_information(client_id, strUuid, strName, strLanguage, nType, nOption, strModuleName); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } Transaction trans; @@ -3067,7 +3067,7 @@ private: trans.write_to_socket(client_socket); } else { - LOGW ("Access denied to get ise information\n"); + LOGW ("Access denied to get ise information"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_RESET_ISE_OPTION) { @@ -3083,7 +3083,7 @@ private: m_info_manager->reset_ise_option(client_id); } else { - LOGW ("Access denied to reset ise option\n"); + LOGW ("Access denied to reset ise option"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_RESET_DEFAULT_ISE) { @@ -3091,7 +3091,7 @@ private: m_info_manager->reset_default_ise(client_id); } else { - LOGW ("Access denied to reset default ise\n"); + LOGW ("Access denied to reset default ise"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_SHOW_ISF_CONTROL) { @@ -3099,7 +3099,7 @@ private: m_info_manager->show_isf_panel(client_id); } else { - LOGW ("Access denied to show isf control\n"); + LOGW ("Access denied to show isf control"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_SHOW_ISE_OPTION_WINDOW) { @@ -3107,7 +3107,7 @@ private: m_info_manager->show_ise_option_window(client_id); } else { - LOGW ("Access denied to show ise option window\n"); + LOGW ("Access denied to show ise option window"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_RESUME_ISE_OPTION_WINDOW) { @@ -3115,7 +3115,7 @@ private: m_info_manager->resume_ise_option_window(client_id); } else { - LOGW ("Access denied to resume ise option window\n"); + LOGW ("Access denied to resume ise option window"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_SHOW_HELPER_ISE_LIST) { @@ -3131,7 +3131,7 @@ private: m_info_manager->show_helper_ise_list(client_id); } else { - LOGW ("Access denied to show helper ise list\n"); + LOGW ("Access denied to show helper ise list"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_SHOW_HELPER_ISE_SELECTOR) { @@ -3146,7 +3146,7 @@ private: m_info_manager->show_helper_ise_selector(client_id); } else { - LOGW ("Access denied to show helper ise selector\n"); + LOGW ("Access denied to show helper ise selector"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_IS_HELPER_ISE_ENABLED) { @@ -3172,7 +3172,7 @@ private: trans.write_to_socket(client_socket); } else { - LOGW ("Access denied to check helper ise enabled\n"); + LOGW ("Access denied to check helper ise enabled"); send_fail_reply (client_id); } } else if (cmd == ISM_TRANS_CMD_GET_RECENT_ISE_GEOMETRY) { @@ -3208,7 +3208,7 @@ private: trans.write_to_socket(client_socket); m_info_manager->hide_helper_ise (); } else { - LOGW ("unknown cmd: %d\n", cmd); + LOGW ("unknown cmd: %d", cmd); } } @@ -3216,7 +3216,7 @@ private: } else if (client_info.type == REMOTEINPUT_ACT_CLIENT) { socket_transaction_start(); while (m_recv_trans.get_command(cmd)) { - LOGD ("PanelAgent::cmd = %d\n", cmd); + LOGD ("PanelAgent::cmd = %d", cmd); if (cmd == ISM_REMOTE_TRANS_CMD_SEND_INPUT_MESSAGE) { char* buf = NULL; size_t len; @@ -3225,7 +3225,7 @@ private: if (m_recv_trans.get_data(&buf, len)) { ret = m_info_manager->remoteinput_send_input_message(client_id, buf, len); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } Transaction trans; @@ -3259,7 +3259,7 @@ private: if (m_recv_trans.get_data(offset) && m_recv_trans.get_data(len)) { ret = m_info_manager->remoteinput_delete_surrounding_text(offset, len); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); } Transaction trans; @@ -3270,7 +3270,7 @@ private: trans.put_command(ret ? SCIM_TRANS_CMD_OK : SCIM_TRANS_CMD_FAIL); trans.write_to_socket(client_socket); } else { - LOGW ("unknown cmd: %d\n", cmd); + LOGW ("unknown cmd: %d", cmd); } } @@ -3281,14 +3281,14 @@ private: void socket_exception_callback(SocketServer* server, const Socket& client) { SCIM_DEBUG_MAIN(2) << "PanelAgent::socket_exception_callback (" << client.get_id() << ")\n"; - LOGD ("client id:%d\n", client.get_id()); + LOGD ("client id:%d", client.get_id()); socket_close_connection(server, client); } bool socket_open_connection(SocketServer* server, const Socket& client) { SCIM_DEBUG_MAIN(3) << "PanelAgent::socket_open_connection (" << client.get_id() << ")\n"; - LOGD ("client id:%d\n", client.get_id()); + LOGD ("client id:%d", client.get_id()); uint32 key; String type = scim_socket_accept_connection(key, String("Panel"), @@ -3311,7 +3311,7 @@ private: unlock(); return true; } - LOGW ("open_connection failed\n"); + LOGW ("open_connection failed"); SCIM_DEBUG_MAIN(4) << "Close client connection " << client.get_id() << "\n"; server->close_connection(client); @@ -3321,7 +3321,7 @@ private: void socket_close_connection(SocketServer* server, const Socket& client) { SCIM_DEBUG_MAIN(3) << "PanelAgent::socket_close_connection (" << client.get_id() << ")\n"; - LOGD ("client id:%d\n", client.get_id()); + LOGD ("client id:%d", client.get_id()); int i = 0; std::vector::iterator IterPos; diff --git a/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp b/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp index a817cf1..089c9b5 100644 --- a/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp +++ b/ism/modules/panelagent/socketconfigserver/socket_config_server_panel_agent_module.cpp @@ -163,7 +163,7 @@ public: return true; } - LOGE ("create socketconfig server failed\n"); + LOGE ("create socketconfig server failed"); return false; } @@ -218,9 +218,9 @@ private: return true; if (nbytes < 0) { - LOGW ("Error occurred when reading socket: %s\n", client.get_error_message ().c_str()); + LOGW ("Error occurred when reading socket: %s", client.get_error_message ().c_str()); } else { - LOGW ("Timeout when reading socket\n"); + LOGW ("Timeout when reading socket"); } return false; @@ -253,7 +253,7 @@ private: /* If the connection is closed then close this client. */ if (!socket_check_client_connection (client)) { - LOGW ("check client connection failed\n"); + LOGW ("check client connection failed"); socket_close_connection (server, client); return; } @@ -272,14 +272,14 @@ private: if (!m_recv_trans.read_from_socket (client, m_socket_timeout) || !m_recv_trans.get_command (cmd) || cmd != SCIM_TRANS_CMD_REQUEST || !m_recv_trans.get_data (key) || key != (uint32) client_info.key) { - LOGW ("cmd:%d key:%d client info key: %d\n", cmd, key, client_info.key); + LOGW ("cmd:%d key:%d client info key: %d", cmd, key, client_info.key); return; } { socket_transaction_start (); while (m_recv_trans.get_command (cmd)) { - LOGD ("PanelAgent::cmd = %d\n", cmd); + LOGD ("PanelAgent::cmd = %d", cmd); if (cmd == SCIM_TRANS_CMD_FLUSH_CONFIG) { if (m_config_readonly) { @@ -307,7 +307,7 @@ private: } _config->erase (key); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } } else if (cmd == SCIM_TRANS_CMD_RELOAD_CONFIG) { @@ -350,11 +350,11 @@ private: m_send_trans.put_command (SCIM_TRANS_CMD_OK); } else { m_send_trans.put_command (SCIM_TRANS_CMD_FAIL); - LOGW ("read config key = %s failed\n", key.c_str ()); + LOGW ("read config key = %s failed", key.c_str ()); } m_send_trans.write_to_socket (client_socket); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } } else if (cmd == SCIM_TRANS_CMD_SET_CONFIG_STRING) { @@ -378,7 +378,7 @@ private: LOGD ("set %s:%s", key.c_str (), value.c_str ()); _config->write (key, value); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } } else if (cmd == SCIM_TRANS_CMD_GET_CONFIG_INT) { @@ -404,11 +404,11 @@ private: m_send_trans.put_command (SCIM_TRANS_CMD_OK); } else { m_send_trans.put_command (SCIM_TRANS_CMD_FAIL); - LOGW ("read config key = %s failed\n", key.c_str ()); + LOGW ("read config key = %s failed", key.c_str ()); } m_send_trans.write_to_socket (client_socket); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } @@ -433,7 +433,7 @@ private: LOGD ("set %s:%d", key.c_str (), value); _config->write (key, (int) value); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } @@ -455,11 +455,11 @@ private: m_send_trans.put_command (SCIM_TRANS_CMD_OK); } else { m_send_trans.put_command (SCIM_TRANS_CMD_FAIL); - LOGW ("read config key = %s failed\n", key.c_str ()); + LOGW ("read config key = %s failed", key.c_str ()); } m_send_trans.write_to_socket (client_socket); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } @@ -483,7 +483,7 @@ private: } _config->write (key, (bool) value); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } } else if (cmd == SCIM_TRANS_CMD_GET_CONFIG_DOUBLE) { @@ -506,11 +506,11 @@ private: m_send_trans.put_command (SCIM_TRANS_CMD_OK); } else { m_send_trans.put_command (SCIM_TRANS_CMD_FAIL); - LOGW ("read config key = %s failed\n", key.c_str()); + LOGW ("read config key = %s failed", key.c_str()); } m_send_trans.write_to_socket (client_socket); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } @@ -537,7 +537,7 @@ private: } _config->write (key, value); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } @@ -559,11 +559,11 @@ private: m_send_trans.put_command (SCIM_TRANS_CMD_OK); } else { m_send_trans.put_command (SCIM_TRANS_CMD_FAIL); - LOGW ("read config key = %s failed\n", key.c_str()); + LOGW ("read config key = %s failed", key.c_str()); } m_send_trans.write_to_socket (client_socket); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } @@ -586,7 +586,7 @@ private: } _config->write (key, vec); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } } else if (cmd == SCIM_TRANS_CMD_GET_CONFIG_VECTOR_INT) { @@ -612,12 +612,12 @@ private: m_send_trans.put_command (SCIM_TRANS_CMD_OK); } else { m_send_trans.put_command (SCIM_TRANS_CMD_FAIL); - LOGW ("read config key = %s failed\n", key.c_str()); + LOGW ("read config key = %s failed", key.c_str()); } m_send_trans.write_to_socket (client_socket); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } @@ -646,7 +646,7 @@ private: _config->write (key, req); } else { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } } @@ -659,14 +659,14 @@ private: void socket_exception_callback (SocketServer* server, const Socket& client) { SCIM_DEBUG_MAIN(2) << "PanelAgent::socket_exception_callback (" << client.get_id() << ")\n"; - LOGD ("client id:%d\n", client.get_id ()); + LOGD ("client id:%d", client.get_id ()); socket_close_connection (server, client); } bool socket_open_connection (SocketServer* server, const Socket& client) { SCIM_DEBUG_MAIN(3) << "PanelAgent::socket_open_connection (" << client.get_id() << ")\n"; - LOGD ("client id:%d\n", client.get_id()); + LOGD ("client id:%d", client.get_id()); uint32 key; String type = scim_socket_accept_connection (key, String ("Panel"), @@ -682,7 +682,7 @@ private: m_clients [client.get_id ()] = info; return true; } - LOGW ("open_connection failed\n"); + LOGW ("open_connection failed"); SCIM_DEBUG_MAIN(4) << "Close client connection " << client.get_id () << "\n"; server->close_connection (client); @@ -692,7 +692,7 @@ private: void socket_close_connection (SocketServer* server, const Socket& client) { SCIM_DEBUG_MAIN(3) << "PanelAgent::socket_close_connection (" << client.get_id () << ")\n"; - LOGD ("client id:%d\n", client.get_id ()); + LOGD ("client id:%d", client.get_id ()); ClientRepository::iterator it = m_clients.find (client.get_id ()); if (it != m_clients.end ()) { diff --git a/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp b/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp index 9743023..12f9c1c 100644 --- a/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp +++ b/ism/modules/panelagent/wayland/isf_wsc_control_ui.cpp @@ -67,7 +67,7 @@ static void keyboard_mode_changed_cb (keynode_t *key, void* data) { int val; if (vconf_get_bool (VCONFKEY_ISF_HW_KEYBOARD_INPUT_DETECTED, &val) != 0) { - LOGW ("Failed to get input detect\n"); + LOGW ("Failed to get input detect"); return; } @@ -165,12 +165,12 @@ void isf_wsc_context_input_panel_show (WSCContextISF* wsc_ctx) iseContext.bidi_direction = wsc_context_bidi_direction_get (wsc_ctx); - LOGD ("ctx : %p, layout : %d, layout variation : %d\n", wsc_ctx, iseContext.layout, iseContext.layout_variation); - LOGD ("language : %d, cursor position : %d, caps mode : %d\n", iseContext.language, iseContext.cursor_pos, iseContext.caps_mode); - LOGD ("return_key_type : %d, return_key_disabled : %d, autocapital type : %d\n", iseContext.return_key_type, iseContext.return_key_disabled, iseContext.autocapital_type); - LOGD ("password mode : %d, prediction_allow : %d\n", iseContext.password_mode, iseContext.prediction_allow); - LOGD ("input hint : %#x\n", iseContext.input_hint); - LOGD ("bidi direction : %d\n", iseContext.bidi_direction); + LOGD ("ctx : %p, layout : %d, layout variation : %d", wsc_ctx, iseContext.layout, iseContext.layout_variation); + LOGD ("language : %d, cursor position : %d, caps mode : %d", iseContext.language, iseContext.cursor_pos, iseContext.caps_mode); + LOGD ("return_key_type : %d, return_key_disabled : %d, autocapital type : %d", iseContext.return_key_type, iseContext.return_key_disabled, iseContext.autocapital_type); + LOGD ("password mode : %d, prediction_allow : %d", iseContext.password_mode, iseContext.prediction_allow); + LOGD ("input hint : %#x", iseContext.input_hint); + LOGD ("bidi direction : %d", iseContext.bidi_direction); int mime_type_size = strlen (mime_types); if (mime_type_size > 0) { @@ -222,7 +222,7 @@ void isf_wsc_context_set_keyboard_mode (WSCContextISF *ctx, TOOLBAR_MODE_T mode) if (_support_hw_keyboard_mode) { kbd_mode = mode; - SECURE_LOGD ("keyboard mode : %d\n", kbd_mode); + SECURE_LOGD ("keyboard mode : %d", kbd_mode); _isf_wsc_context_set_keyboard_mode (_get_context_id (ctx), mode); } } @@ -233,7 +233,7 @@ isf_wsc_context_input_panel_layout_set (WSCContextISF *ctx, Ecore_IMF_Input_Pane WSCContextISF *context_scim = ctx; if (context_scim == get_focused_ic ()) { - LOGD ("layout type : %d\n", layout); + LOGD ("layout type : %d", layout); _isf_wsc_context_input_panel_layout_set (_get_context_id (ctx), layout); } } @@ -248,7 +248,7 @@ Ecore_IMF_Input_Panel_Layout isf_wsc_context_input_panel_layout_get (WSCContextI void isf_wsc_context_input_panel_caps_mode_set (WSCContextISF *ctx, unsigned int mode) { - LOGD ("ctx : %p, mode : %d\n", ctx, mode); + LOGD ("ctx : %p, mode : %d", ctx, mode); _isf_wsc_context_input_panel_caps_mode_set (_get_context_id (ctx), mode); } @@ -262,20 +262,20 @@ void isf_wsc_context_input_panel_language_set (WSCContextISF *ctx, Ecore_IMF_Inp WSCContextISF *context_scim = ctx; if (context_scim == get_focused_ic ()) { - LOGD ("language mode : %d\n", language); + LOGD ("language mode : %d", language); _isf_wsc_context_input_panel_language_set (_get_context_id (ctx), language); } } void isf_wsc_context_input_panel_return_key_type_set (WSCContextISF *ctx, Ecore_IMF_Input_Panel_Return_Key_Type return_key_type) { - LOGD ("ctx : %p, return key type : %d\n", ctx, return_key_type); + LOGD ("ctx : %p, return key type : %d", ctx, return_key_type); _isf_wsc_context_input_panel_return_key_type_set (_get_context_id (ctx), return_key_type); } void isf_wsc_context_input_panel_return_key_disabled_set (WSCContextISF *ctx, Eina_Bool disabled) { - LOGD ("ctx : %p, disabled : %d\n", ctx, disabled); + LOGD ("ctx : %p, disabled : %d", ctx, disabled); _isf_wsc_context_input_panel_return_key_disabled_set (_get_context_id (ctx), disabled); } diff --git a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp index 959e409..1b33eaa 100644 --- a/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp +++ b/ism/modules/panelagent/wayland/wayland_panel_agent_module.cpp @@ -253,7 +253,7 @@ _wsc_im_ctx_content_type (void *data, struct wl_input_method_context *im_ctx, ui WSCContextISF *wsc_ctx = (WSCContextISF*)data; if (!wsc_ctx) return; - LOGD ("im_context = %p hint = %04x purpose = %d\n", im_ctx, hint, purpose); + LOGD ("im_context = %p hint = %04x purpose = %d", im_ctx, hint, purpose); // Set layout if (wsc_ctx->content_purpose != purpose || !wsc_ctx->layout_initialized) { @@ -308,7 +308,7 @@ _wsc_im_ctx_invoke_action (void *data, struct wl_input_method_context *im_ctx, u WSCContextISF *wsc_ctx = (WSCContextISF*)data; if (!wsc_ctx) return; - LOGD ("invoke action. button : %d\n", button); + LOGD ("invoke action. button : %d", button); if (button != BTN_LEFT) return; @@ -344,7 +344,7 @@ _wsc_im_ctx_preferred_language (void *data, struct wl_input_method_context *im_c if (language) { wsc_ctx->language = strdup (language); - LOGD ("Language changed, new: '%s'\n", language); + LOGD ("Language changed, new: '%s'", language); } } @@ -353,7 +353,7 @@ _wsc_im_ctx_return_key_type (void *data, struct wl_input_method_context *im_ctx, { WSCContextISF *wsc_ctx = (WSCContextISF*)data; - LOGD ("im_context = %p return key type = %d\n", im_ctx, return_key_type); + LOGD ("im_context = %p return key type = %d", im_ctx, return_key_type); if (!wsc_ctx) return; if (wsc_ctx->return_key_type != return_key_type) { @@ -368,7 +368,7 @@ _wsc_im_ctx_return_key_disabled (void *data, struct wl_input_method_context *im_ WSCContextISF *wsc_ctx = (WSCContextISF*)data; Eina_Bool return_key_disabled = !!disabled; - LOGD ("im_context = %p return key disabled = %d\n", im_ctx, return_key_disabled); + LOGD ("im_context = %p return key disabled = %d", im_ctx, return_key_disabled); if (!wsc_ctx) return; if (wsc_ctx->return_key_disabled != return_key_disabled) { @@ -384,7 +384,7 @@ static void _wsc_im_ctx_input_panel_data (void *data, struct wl_input_method_context *im_ctx, const char *input_panel_data, uint32_t input_panel_data_length) { WSCContextISF *wsc_ctx = (WSCContextISF*)data; - LOGD ("im_context = %p input panel data = %s len = %d\n", im_ctx, input_panel_data, input_panel_data_length); + LOGD ("im_context = %p input panel data = %s len = %d", im_ctx, input_panel_data, input_panel_data_length); if (!wsc_ctx) return; if (wsc_ctx->impl) { @@ -407,7 +407,7 @@ _wsc_im_ctx_bidi_direction (void *data, struct wl_input_method_context *im_ctx, { WSCContextISF *wsc_ctx = (WSCContextISF*)data; - LOGD ("im_context = %p bidi_direction = %d\n", im_ctx, bidi_direction); + LOGD ("im_context = %p bidi_direction = %d", im_ctx, bidi_direction); if (!wsc_ctx) return; if (wsc_ctx->bidi_direction != bidi_direction) { @@ -422,11 +422,11 @@ _wsc_im_ctx_cursor_position (void *data, struct wl_input_method_context *im_ctx, { WSCContextISF *wsc_ctx = (WSCContextISF*)data; - LOGD ("im_context = %p cursor_pos = %d\n", im_ctx, cursor_pos); + LOGD ("im_context = %p cursor_pos = %d", im_ctx, cursor_pos); if (!wsc_ctx || !wsc_ctx->impl) return; wsc_ctx->impl->cursor_pos = cursor_pos; wsc_ctx->surrounding_cursor = cursor_pos; - LOGD ("wsc_ctx->surrounding_cursor = %d\n", wsc_ctx->surrounding_cursor); + LOGD ("wsc_ctx->surrounding_cursor = %d", wsc_ctx->surrounding_cursor); g_info_manager->socket_update_cursor_position (cursor_pos); if (_TV) @@ -438,7 +438,7 @@ _wsc_im_ctx_process_input_device_event (void *data, struct wl_input_method_conte { WSCContextISF *wsc_ctx = (WSCContextISF*)data; - LOGD("im_context = %p type = %d, data = (%p) %d\n", im_ctx, type, input_data, input_data_len); + LOGD("im_context = %p type = %d, data = (%p) %d", im_ctx, type, input_data, input_data_len); if (!wsc_ctx) return; isf_wsc_context_process_input_device_event (wsc_ctx, type, input_data, input_data_len); @@ -471,7 +471,7 @@ _wsc_im_ctx_prediction_hint (void *data, struct wl_input_method_context *im_ctx, { WSCContextISF *wsc_ctx = (WSCContextISF*)data; - LOGD ("im_context = %p, prediction hint = %s\n", im_ctx, prediction_hint); + LOGD ("im_context = %p, prediction hint = %s", im_ctx, prediction_hint); if (!wsc_ctx) return; isf_wsc_context_input_panel_prediction_hint_set (wsc_ctx, prediction_hint); @@ -482,7 +482,7 @@ _wsc_im_ctx_mime_type (void *data, struct wl_input_method_context *im_ctx, const { WSCContextISF *wsc_ctx = (WSCContextISF*)data; - LOGD ("im_context = %p, mime_type = %s\n", im_ctx, mime_type); + LOGD ("im_context = %p, mime_type = %s", im_ctx, mime_type); if (!wsc_ctx) return; if (wsc_ctx->impl) { @@ -497,7 +497,7 @@ _wsc_im_ctx_finalized_content (void *data, struct wl_input_method_context *im_ct { WSCContextISF *wsc_ctx = (WSCContextISF*)data; - SECURE_LOGD ("im_context = %p, text = %s, cursor_pos = %d\n", im_ctx, text, cursor_pos); + SECURE_LOGD ("im_context = %p, text = %s, cursor_pos = %d", im_ctx, text, cursor_pos); if (!wsc_ctx) return; isf_wsc_context_input_panel_finalize_content (wsc_ctx, text, cursor_pos); @@ -597,13 +597,13 @@ _wsc_im_keyboard_keymap (void *data, close (fd); if (!wsc_ctx->keymap) { - LOGW ("failed to compile keymap\n"); + LOGW ("failed to compile keymap"); return; } wsc_ctx->state = xkb_state_new (wsc_ctx->keymap); if (!wsc_ctx->state) { - LOGW ("failed to create XKB state\n"); + LOGW ("failed to create XKB state"); xkb_map_unref (wsc_ctx->keymap); return; } @@ -615,7 +615,7 @@ _wsc_im_keyboard_keymap (void *data, wsc_ctx->shift_mask = 1 << xkb_map_mod_get_index (wsc_ctx->keymap, "Shift"); - LOGD ("create _keysym2keycode\n"); + LOGD ("create _keysym2keycode"); _init_keysym2keycode (wsc_ctx); } @@ -789,7 +789,7 @@ _wsc_im_activate (void *data, struct wl_input_method *input_method, struct wl_in #if ENABLE_GRAB_KEYBOARD wsc_ctx->xkb_context = xkb_context_new ((xkb_context_flags)0); if (wsc_ctx->xkb_context == NULL) { - LOGW ("Failed to create XKB context\n"); + LOGW ("Failed to create XKB context"); delete wsc_ctx; return; } @@ -804,7 +804,7 @@ _wsc_im_activate (void *data, struct wl_input_method *input_method, struct wl_in wsc_ctx->surrounding_text = NULL; wsc_ctx->remote_surrounding_text = NULL; wsc_ctx->surrounding_cursor = 0; - LOGD ("wsc_ctx->surrounding_cursor = %d\n", wsc_ctx->surrounding_cursor); + LOGD ("wsc_ctx->surrounding_cursor = %d", wsc_ctx->surrounding_cursor); get_language (&wsc_ctx->language); @@ -906,17 +906,17 @@ _wsc_setup (struct weescim *wsc) } if (wsc->im == NULL) { - LOGW ("Failed because wl_input_method is null\n"); + LOGW ("Failed because wl_input_method is null"); return false; } /* Input method listener */ - LOGD ("Adding wl_input_method listener\n"); + LOGD ("Adding wl_input_method listener"); if (wsc->im) wl_input_method_add_listener (wsc->im, &wsc_im_listener, wsc); else { - LOGW ("Couldn't get wayland input method interface\n"); + LOGW ("Couldn't get wayland input method interface"); return false; } @@ -1128,7 +1128,7 @@ static void check_input_resource (WSCContextISF *wsc_ctx, Input_Resource input_res) { WSCContextISF* context_scim = wsc_ctx; - LOGD ("Input resource : %d\n", input_res); + LOGD ("Input resource : %d", input_res); SCIM_DEBUG_FRONTEND (1) << __FUNCTION__ << "...\n"; if (context_scim && context_scim->impl) { @@ -1349,7 +1349,7 @@ isf_wsc_context_focus_in (WSCContextISF *wsc_ctx) if (_change_keyboard_mode_by_focus_move) { //if h/w keyboard mode, keyboard mode will be changed to s/w mode when the entry get the focus. - LOGD ("Keyboard mode is changed H/W->S/W because of focus_in.\n"); + LOGD ("Keyboard mode is changed H/W->S/W because of focus_in."); isf_wsc_context_set_keyboard_mode (wsc_ctx, TOOLBAR_HELPER_MODE); } @@ -1383,7 +1383,7 @@ isf_wsc_context_focus_in (WSCContextISF *wsc_ctx) if (context_scim->impl->imdata) context_scim->impl->si->set_imdata ((const char*)context_scim->impl->imdata, context_scim->impl->imdata_size); #endif - LOGD ("set autocapital type : %d\n", context_scim->impl->autocapital_type); + LOGD ("set autocapital type : %d", context_scim->impl->autocapital_type); g_info_manager->set_autocapital_type ((int)context_scim->impl->autocapital_type); } else { g_info_manager->socket_turn_off (); @@ -1400,7 +1400,7 @@ isf_wsc_context_focus_in (WSCContextISF *wsc_ctx) context_scim->impl->input_resource = INPUT_RESOURCE_NONE; } - LOGD ("ctx : %p\n", wsc_ctx); + LOGD ("ctx : %p", wsc_ctx); } void @@ -1414,7 +1414,7 @@ isf_wsc_context_focus_out (WSCContextISF *wsc_ctx) SCIM_DEBUG_FRONTEND(1) << __FUNCTION__ << "(" << context_scim->id << ")...\n"; if (context_scim && context_scim->impl && context_scim == _focused_ic) { - LOGD ("ctx : %p\n", wsc_ctx); + LOGD ("ctx : %p", wsc_ctx); if (context_scim->impl->need_commit_preedit) { _hide_preedit_string (context_scim->id, false); @@ -1489,10 +1489,10 @@ isf_wsc_context_autocapital_type_set (WSCContextISF* wsc_ctx, Ecore_IMF_Autocapi if (context_scim && context_scim->impl && context_scim->impl->autocapital_type != autocapital_type) { context_scim->impl->autocapital_type = autocapital_type; - LOGD ("ctx : %p. set autocapital type : %d\n", wsc_ctx, autocapital_type); + LOGD ("ctx : %p. set autocapital type : %d", wsc_ctx, autocapital_type); if (context_scim == _focused_ic) { - LOGD ("ctx : %p. set autocapital type : %d\n", wsc_ctx, autocapital_type); + LOGD ("ctx : %p. set autocapital type : %d", wsc_ctx, autocapital_type); g_info_manager->set_autocapital_type ((int)autocapital_type); } } @@ -1510,7 +1510,7 @@ isf_wsc_context_bidi_direction_set (WSCContextISF* wsc_ctx, Ecore_IMF_BiDi_Direc context_scim->impl->bidi_direction = direction; if (context_scim == _focused_ic) { - LOGD ("ctx : %p, bidi direction : %#x\n", wsc_ctx, direction); + LOGD ("ctx : %p, bidi direction : %#x", wsc_ctx, direction); panel_req_update_bidi_direction (context_scim, direction); } } @@ -1532,7 +1532,7 @@ isf_wsc_context_send_surrounding_text (WSCContextISF* wsc_ctx, const char *text, return; if (!context_scim->impl->init_remote_surrounding_text || strcmp (conv_text, text) != 0 || context_scim->impl->cursor_pos != cursor) { - SECURE_LOGD("remote surrounding text : \"%s\"\n", text); + SECURE_LOGD("remote surrounding text : \"%s\"", text); context_scim->impl->surrounding_text = utf8_mbstowcs (String (text)); context_scim->impl->cursor_pos = cursor; @@ -1668,8 +1668,8 @@ isf_wsc_context_filter_key_event (WSCContextISF* wsc_ctx, if (hw_key_detect) { isf_wsc_context_set_keyboard_mode (wsc_ctx, TOOLBAR_KEYBOARD_MODE); - ISF_SAVE_LOG ("Changed keyboard mode from S/W to H/W (code: %x, name: %s)\n", key.code, keyname); - LOGD ("Hardware keyboard mode, active helper option: %d\n", _active_helper_option); + ISF_SAVE_LOG ("Changed keyboard mode from S/W to H/W (code: %x, name: %s)", key.code, keyname); + LOGD ("Hardware keyboard mode, active helper option: %d", _active_helper_option); } } } @@ -1700,7 +1700,7 @@ isf_wsc_context_filter_key_event (WSCContextISF* wsc_ctx, if (!wsc_ctx) return; if (!keysym) { - LOGD("key is NULL\n"); + LOGD("key is NULL"); return; } @@ -1765,8 +1765,8 @@ isf_wsc_context_filter_key_event (WSCContextISF* wsc_ctx, if (hw_key_detect) { isf_wsc_context_set_keyboard_mode (wsc_ctx, TOOLBAR_KEYBOARD_MODE); - ISF_SAVE_LOG ("Changed keyboard mode from S/W to H/W (code: %x, key : %s)\n", key.code, keysym); - LOGD ("Hardware keyboard mode, active helper option: %d\n", _active_helper_option); + ISF_SAVE_LOG ("Changed keyboard mode from S/W to H/W (code: %x, key : %s)", key.code, keysym); + LOGD ("Hardware keyboard mode, active helper option: %d", _active_helper_option); } } } @@ -1827,11 +1827,11 @@ wsc_commit_preedit (WSCContextISF* wsc_ctx) free (wsc_ctx->surrounding_text); wsc_ctx->surrounding_text = surrounding_text; wsc_ctx->surrounding_cursor += strlen (wsc_ctx->preedit_str); - LOGD ("wsc_ctx->surrounding_cursor = %d\n", wsc_ctx->surrounding_cursor); + LOGD ("wsc_ctx->surrounding_cursor = %d", wsc_ctx->surrounding_cursor); } else { wsc_ctx->surrounding_text = strdup (wsc_ctx->preedit_str); wsc_ctx->surrounding_cursor = strlen (wsc_ctx->preedit_str); - LOGD ("wsc_ctx->surrounding_cursor = %d\n", wsc_ctx->surrounding_cursor); + LOGD ("wsc_ctx->surrounding_cursor = %d", wsc_ctx->surrounding_cursor); } if (wsc_ctx->preedit_str) @@ -1996,7 +1996,7 @@ remote_surrounding_text_fd_read_func (void* data, Ecore_Fd_Handler* fd_handler) int len = read (fd, buff, sizeof (buff) - 1); if (len == 0) { - SECURE_LOGD ("remote_surrounding_text : %s, surrounding_cursor : %d\n", wsc_ctx->remote_surrounding_text, wsc_ctx->surrounding_cursor); + SECURE_LOGD ("remote_surrounding_text : %s, surrounding_cursor : %d", wsc_ctx->remote_surrounding_text, wsc_ctx->surrounding_cursor); isf_wsc_context_send_surrounding_text (wsc_ctx, wsc_ctx->remote_surrounding_text ? wsc_ctx->remote_surrounding_text : "", wsc_ctx->surrounding_cursor); } else if (len < 0) { LOGW ("failed"); @@ -2530,7 +2530,7 @@ panel_slot_commit_string (int context, const WideString &wstr, bool remote_mode) if (remote_mode) { if (ic->impl->block_input_resource) { - LOGW ("block remote input\n"); + LOGW ("block remote input"); return; } check_input_resource (ic, INPUT_RESOURCE_REMOTE); @@ -2563,7 +2563,7 @@ panel_slot_forward_key_event (int context, const KeyEvent &key, bool remote_mode if (remote_mode) { if (ic->impl->block_input_resource) { - LOGW ("block remote input\n"); + LOGW ("block remote input"); return; } check_input_resource (ic, INPUT_RESOURCE_REMOTE); @@ -2587,7 +2587,7 @@ panel_slot_update_preedit_string (int context, const WideString str, const WideS if (ic && ic->impl && _focused_ic == ic) { if (remote_mode) { if (ic->impl->block_input_resource) { - LOGW ("block remote input\n"); + LOGW ("block remote input"); return; } check_input_resource (ic, INPUT_RESOURCE_REMOTE); @@ -2690,7 +2690,7 @@ _hide_preedit_string (int context, bool update_preedit) void initialize (void) { - LOGD ("Initializing Wayland ISF IMModule...\n"); + LOGD ("Initializing Wayland ISF IMModule..."); // Get system language. _language = scim_get_locale_language (scim_get_current_locale ()); @@ -2701,7 +2701,7 @@ initialize (void) static void finalize (void) { - LOGD ("Finalizing Ecore ISF IMModule...\n"); + LOGD ("Finalizing Ecore ISF IMModule..."); SCIM_DEBUG_FRONTEND(2) << "Finalize all IC partially.\n"; while (_used_ic_impl_list) { @@ -2889,7 +2889,7 @@ public: _wl_im_ctx = new _wl_im; if (!_wl_im_ctx) { - LOGW ("Can not create wl_im_ctx\n"); + LOGW ("Can not create wl_im_ctx"); return false; } @@ -3122,7 +3122,7 @@ public: char buff[512]; int len = read (fd, buff, sizeof (buff) - 1); if (len == 0) { - LOGD ("update, wsc_ctx->surrounding_cursor = %d\n", wsc_ctx->surrounding_cursor); + LOGD ("update, wsc_ctx->surrounding_cursor = %d", wsc_ctx->surrounding_cursor); g_info_manager->socket_update_surrounding_text (wsc_ctx->surrounding_text ? wsc_ctx->surrounding_text : "", wsc_ctx->surrounding_cursor); } else if (len < 0) { LOGW ("failed"); diff --git a/ism/src/isf_info_manager.cpp b/ism/src/isf_info_manager.cpp index 44b6a02..fcf9e75 100644 --- a/ism/src/isf_info_manager.cpp +++ b/ism/src/isf_info_manager.cpp @@ -1043,7 +1043,7 @@ public: m_current_helper_uuid = String (""); m_panel_agent_manager.exit (it->second.id, ctx); SCIM_DEBUG_MAIN (1) << "Stop helper\n"; - ISF_SAVE_LOG ("send SCIM_TRANS_CMD_EXIT message to %s\n", uuid.c_str ()); + ISF_SAVE_LOG ("send SCIM_TRANS_CMD_EXIT message to %s", uuid.c_str ()); } /* Since we are stopping this helper, erase information from start_helper_ic_index too */ @@ -1305,7 +1305,7 @@ public: LOGD ("Send ISM_TRANS_CMD_SHOW_ISE_OPTION_WINDOW message"); if (!m_signal_launch_option_application (uuid)) { - LOGD ("call show helper option\n"); + LOGD ("call show helper option"); m_panel_agent_manager.show_helper_option_window (it->second.id, ctx, uuid); } @@ -2853,7 +2853,7 @@ public: static double clock_tiks = (double)sysconf (_SC_CLK_TCK); clock_t curr_tiks = times (&tiks_buf); double secs = (double) (curr_tiks - start_tiks) / clock_tiks; - //LOGE ("time second:%f\n", secs); + //LOGE ("time second:%f", secs); static String restart_uuid; if (restart_uuid != uuid || secs > MIN_REPEAT_TIME) { @@ -2880,7 +2880,7 @@ public: LOGE ("Auto restart soft ISE:%s", uuid.c_str ()); } else { reset_default_ise (0); - ISF_SAVE_LOG ("Auto restart is abnormal, reset default ISE\n"); + ISF_SAVE_LOG ("Auto restart is abnormal, reset default ISE"); } start_tiks = curr_tiks; @@ -3848,11 +3848,11 @@ client context helpers: %d, helpers uuid count: %d", m_start_helper_ic_index.erase (icit); result = true; } else { - LOGW ("Failed to register IME : %s\n", info.uuid.c_str ()); + LOGW ("Failed to register IME : %s", info.uuid.c_str ()); m_panel_agent_manager.send_fail_reply(client); } } else { - LOGW ("Failed to register IME : %s\n", info.uuid.c_str ()); + LOGW ("Failed to register IME : %s", info.uuid.c_str ()); m_panel_agent_manager.send_fail_reply(client); } } @@ -3860,7 +3860,7 @@ client context helpers: %d, helpers uuid count: %d", unlock (); if (result) { - LOGD ("Succeed to regster IME : %s\n", info.uuid.c_str ()); + LOGD ("Succeed to regster IME : %s", info.uuid.c_str ()); m_signal_register_helper (client, info); } } diff --git a/ism/src/isf_message_queue.h b/ism/src/isf_message_queue.h index 52ae75b..b9c9104 100644 --- a/ism/src/isf_message_queue.h +++ b/ism/src/isf_message_queue.h @@ -838,14 +838,14 @@ public: String ic_uuid; if (!transaction.get_command(cmd) || cmd != SCIM_TRANS_CMD_REPLY) { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); return true; } /* If there are ic and ic_uuid then read them. */ if (!(transaction.get_data_type() == SCIM_TRANS_DATA_COMMAND) && !(transaction.get_data(ic) && transaction.get_data(ic_uuid))) { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); return true; } @@ -883,7 +883,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -899,7 +899,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -915,7 +915,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -931,7 +931,7 @@ public: message->get_ic_ref() = ic; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -946,7 +946,7 @@ public: message->get_ic_ref() = ic; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -960,7 +960,7 @@ public: if (transaction.get_data(message->get_property_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -976,7 +976,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1035,7 +1035,7 @@ public: message->get_ic_ref() = ic; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1069,7 +1069,7 @@ public: if (transaction.get_data(message->get_mode_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1083,7 +1083,7 @@ public: if (transaction.get_data(message->get_language_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1097,7 +1097,7 @@ public: if (transaction.get_data(message->get_imdata_ptr(), message->get_len_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1149,7 +1149,7 @@ public: if (transaction.get_data(message->get_disabled_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1173,7 +1173,7 @@ public: transaction.get_data(message->get_serial_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1187,7 +1187,7 @@ public: if (transaction.get_data(message->get_layout_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1210,7 +1210,7 @@ public: if (transaction.get_data(message->get_input_mode_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1224,7 +1224,7 @@ public: if (transaction.get_data(message->get_mode_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1252,7 +1252,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1271,7 +1271,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1289,7 +1289,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1315,7 +1315,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1353,7 +1353,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1369,7 +1369,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1407,7 +1407,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1443,7 +1443,7 @@ public: if (transaction.get_data(message->get_candidate_table_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1455,7 +1455,7 @@ public: if (transaction.get_data(message->get_row_items_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } break; @@ -1468,7 +1468,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } break; @@ -1497,7 +1497,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } break; @@ -1519,7 +1519,7 @@ public: if (transaction.get_data(message->get_state_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } break; @@ -1532,7 +1532,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } break; @@ -1547,7 +1547,7 @@ public: message->get_ic_uuid_ref() = ic_uuid; m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1561,7 +1561,7 @@ public: if (transaction.get_data(message->get_input_hint_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1575,7 +1575,7 @@ public: if (transaction.get_data(message->get_bidi_direction())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1621,7 +1621,7 @@ public: transaction.get_data(message->get_data_ptr(), message->get_len_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1635,7 +1635,7 @@ public: if (transaction.get_data(message->get_auto_capital_type_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1649,7 +1649,7 @@ public: if (transaction.get_data(message->get_prediction_allow_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1663,7 +1663,7 @@ public: if (transaction.get_data(message->get_mode_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1686,7 +1686,7 @@ public: if (transaction.get_data(message->get_message_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1700,7 +1700,7 @@ public: if (transaction.get_data(message->get_mime_type_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } @@ -1715,7 +1715,7 @@ public: transaction.get_data(message->get_cursor_pos_ref())) { m_list_messages.push_back(message); } else { - LOGW("wrong format of transaction\n"); + LOGW("wrong format of transaction"); dealloc_message(message); } } diff --git a/ism/src/isf_pkg.cpp b/ism/src/isf_pkg.cpp index 5a1832d..bf9c691 100644 --- a/ism/src/isf_pkg.cpp +++ b/ism/src/isf_pkg.cpp @@ -275,7 +275,7 @@ void isf_pkg_reload_ime_info_db(void) isf_db_begin_transaction(); ret = pkgmgrinfo_appinfo_filter_foreach_appinfo (handle, isf_pkg_ime_app_list_cb, NULL); if (ret != PMINFO_R_OK) { - LOGW ("pkgmgrinfo_appinfo_filter_foreach_appinfo failed(%d)\n", ret); + LOGW ("pkgmgrinfo_appinfo_filter_foreach_appinfo failed(%d)", ret); isf_db_rollback_transaction(); } else { isf_db_commit_transaction(); @@ -319,7 +319,7 @@ int isf_pkg_select_all_ime_info_db(std::vector &ime_info) static int _find_ime_setting (const pkgmgrinfo_appinfo_h handle, void *user_data) { if (!user_data) { - LOGW ("user_data is null!\n"); + LOGW ("user_data is null!"); return -1; } @@ -328,18 +328,18 @@ static int _find_ime_setting (const pkgmgrinfo_appinfo_h handle, void *user_data char *ime_setting_pkgid = NULL; int ret = 0; - LOGD ("ime pkg id : %s\n", ime_pkgid.c_str ()); + LOGD ("ime pkg id : %s", ime_pkgid.c_str ()); /* Get appid */ ret = pkgmgrinfo_appinfo_get_appid (handle, &ime_setting_appid); if (ret == PMINFO_R_OK) { ret = pkgmgrinfo_appinfo_get_pkgid (handle, &ime_setting_pkgid); if (ret != PMINFO_R_OK) { - LOGW ("pkgmgrinfo_appinfo_get_pkgid failed!\n"); + LOGW ("pkgmgrinfo_appinfo_get_pkgid failed!"); return -1; } - LOGD ("setting appid : %s, setting app pkg id : %s, ime_pkg id : %s\n", ime_setting_appid, ime_setting_pkgid, ime_pkgid.c_str ()); + LOGD ("setting appid : %s, setting app pkg id : %s, ime_pkg id : %s", ime_setting_appid, ime_setting_pkgid, ime_pkgid.c_str ()); if (String (ime_setting_pkgid) == ime_pkgid) { ime_setting_app = String (ime_setting_appid); @@ -347,7 +347,7 @@ static int _find_ime_setting (const pkgmgrinfo_appinfo_h handle, void *user_data } } else { - LOGW ("pkgmgrinfo_appinfo_get_appid failed!\n"); + LOGW ("pkgmgrinfo_appinfo_get_appid failed!"); return -1; } @@ -367,13 +367,13 @@ String isf_pkg_get_setting_app (String ime_appid) /* Get pkgid */ ret = pkgmgrinfo_appinfo_get_appinfo (ime_appid.c_str (), &appinfo_handle); if (ret != PMINFO_R_OK) { - LOGW ("pkgmgrinfo_appinfo_get_appinfo failed.\n"); + LOGW ("pkgmgrinfo_appinfo_get_appinfo failed."); return ime_setting_app; } ret = pkgmgrinfo_appinfo_get_pkgid (appinfo_handle, &pkgid); if (ret != PMINFO_R_OK) { - LOGW ("pkgmgrinfo_appinfo_get_pkgid failed! error code=%d\n", ret); + LOGW ("pkgmgrinfo_appinfo_get_pkgid failed! error code=%d", ret); pkgmgrinfo_appinfo_destroy_appinfo (appinfo_handle); return ime_setting_app; } diff --git a/ism/src/isf_query_utility.cpp b/ism/src/isf_query_utility.cpp index c1c37b7..71b3ae1 100644 --- a/ism/src/isf_query_utility.cpp +++ b/ism/src/isf_query_utility.cpp @@ -97,20 +97,20 @@ static inline int _begin_transaction(void) if (databaseInfo.in_transaction != false) { - LOGE("Transaction already started\n"); + LOGE("Transaction already started"); return EXIT_FAILURE; } int ret = sqlite3_prepare_v2(databaseInfo.pHandle, "BEGIN TRANSACTION", -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return EXIT_FAILURE; } if (sqlite3_step(pStmt) != SQLITE_DONE) { - LOGE ("sqlite3_step: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step: %s", sqlite3_errmsg(databaseInfo.pHandle)); sqlite3_finalize(pStmt); return EXIT_FAILURE; } @@ -127,20 +127,20 @@ static inline int _rollback_transaction(void) if (databaseInfo.in_transaction != true) { - LOGE("Transaction not started\n"); + LOGE("Transaction not started"); return EXIT_FAILURE; } int ret = sqlite3_prepare_v2(databaseInfo.pHandle, "ROLLBACK TRANSACTION", -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return EXIT_FAILURE; } if (sqlite3_step(pStmt) != SQLITE_DONE) { - LOGE ("sqlite3_step: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step: %s", sqlite3_errmsg(databaseInfo.pHandle)); sqlite3_finalize(pStmt); return EXIT_FAILURE; } @@ -157,20 +157,20 @@ static inline int _commit_transaction(void) if (databaseInfo.in_transaction != true) { - LOGE("Transaction not started\n"); + LOGE("Transaction not started"); return EXIT_FAILURE; } int ret = sqlite3_prepare_v2(databaseInfo.pHandle, "COMMIT TRANSACTION", -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return EXIT_FAILURE; } if (sqlite3_step(pStmt) != SQLITE_DONE) { - LOGE ("sqlite3_step: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step: %s", sqlite3_errmsg(databaseInfo.pHandle)); sqlite3_finalize(pStmt); return EXIT_FAILURE; } @@ -187,7 +187,7 @@ static inline int _db_integrity_check_cb(void *NotUsed, int argc, char **argv, c std::transform(result_DB_check.begin(), result_DB_check.end(), result_DB_check.begin(), ::tolower); if (result_DB_check != "ok") { databaseInfo.need_reset = true; - LOGE ("DB integrity check failed\n"); + LOGE ("DB integrity check failed"); } return 0; @@ -199,7 +199,7 @@ static inline int _db_create_ime_info(void) static const char* pQuery = "CREATE TABLE ime_info (appid TEXT PRIMARY KEY NOT NULL, label TEXT, pkgid TEXT, pkgtype TEXT, exec TEXT, mname TEXT, mpath TEXT, mode INTEGER, options INTEGER, is_enabled INTEGER, is_preinstalled INTEGER, has_option INTEGER, disp_lang TEXT);"; int ret = sqlite3_exec(databaseInfo.pHandle, pQuery, NULL, NULL, &pException); if (ret != SQLITE_OK) { - LOGE ("sqlite3_exec returned %d: %s\n", ret, pException); + LOGE ("sqlite3_exec returned %d: %s", ret, pException); sqlite3_free(pException); databaseInfo.need_reset = true; return -EIO; @@ -228,7 +228,7 @@ static inline int _db_init(void) struct stat stat; int ret = db_util_open(databaseInfo.pPath, &databaseInfo.pHandle, DB_UTIL_REGISTER_HOOK_METHOD); if (ret != SQLITE_OK) { - LOGE ("db_util_open(\"%s\", ~) returned %d: %s\n", databaseInfo.pPath, ret, sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("db_util_open(\"%s\", ~) returned %d: %s", databaseInfo.pPath, ret, sqlite3_errmsg(databaseInfo.pHandle)); if (databaseInfo.pHandle) db_util_close(databaseInfo.pHandle); databaseInfo.pHandle = NULL; @@ -238,7 +238,7 @@ static inline int _db_init(void) if (lstat(databaseInfo.pPath, &stat) < 0) { char buf_err[256]; - LOGE("lstat failed. %s\n", strerror_r (errno, buf_err, sizeof (buf_err))); + LOGE("lstat failed. %s", strerror_r (errno, buf_err, sizeof (buf_err))); if (databaseInfo.pHandle) db_util_close(databaseInfo.pHandle); databaseInfo.pHandle = NULL; @@ -247,7 +247,7 @@ static inline int _db_init(void) } if (!S_ISREG(stat.st_mode)) { - LOGE ("S_ISREG failed.\n"); + LOGE ("S_ISREG failed."); if (databaseInfo.pHandle) db_util_close(databaseInfo.pHandle); databaseInfo.pHandle = NULL; @@ -266,14 +266,14 @@ static inline int _db_init(void) int ret = sqlite3_exec(databaseInfo.pHandle, pQuery, NULL, NULL, &pException); if (ret != SQLITE_OK) { databaseInfo.need_reset = true; - LOGE ("sqlite3_exec returned %d: %s\n", ret, pException); + LOGE ("sqlite3_exec returned %d: %s", ret, pException); sqlite3_free(pException); } } if (SQLITE_CORRUPT == sqlite3_exec(databaseInfo.pHandle, "pragma integrity_check", _db_integrity_check_cb, NULL, NULL)) { databaseInfo.need_reset = true; - LOGE ("DB has been corrupted.\n"); + LOGE ("DB has been corrupted."); } return 0; @@ -292,7 +292,7 @@ static inline int _db_connect(void) if (ret < 0) { - LOGE ("_db_init failed. error code=%d\n", ret); + LOGE ("_db_init failed. error code=%d", ret); return -EIO; } } @@ -338,7 +338,7 @@ static int _db_select_all_ime_info(std::vector &ime_info) ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return 0; } @@ -379,7 +379,7 @@ static int _db_select_all_ime_info(std::vector &ime_info) db_text = (char *)sqlite3_column_text(pStmt, 12); info.display_lang = String(db_text ? db_text : ""); - SECURE_LOGD ("appid=\"%s\", label=\"%s\", pkgid=\"%s\", pkgtype=\"%s\", exec=\"%s\", mname=\"%s\", mpath=\"%s\", mode=%d, options=%u, is_enabled=%u, is_preinstalled=%u, has_option=%d, disp_lang=\"%s\"\n", + SECURE_LOGD ("appid=\"%s\", label=\"%s\", pkgid=\"%s\", pkgtype=\"%s\", exec=\"%s\", mname=\"%s\", mpath=\"%s\", mode=%d, options=%u, is_enabled=%u, is_preinstalled=%u, has_option=%d, disp_lang=\"%s\"", info.appid.c_str(), info.label.c_str(), info.pkgid.c_str(), @@ -400,7 +400,7 @@ static int _db_select_all_ime_info(std::vector &ime_info) } while (ret == SQLITE_ROW); if (ret != SQLITE_DONE) { - LOGE ("sqlite3_step: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step: %s", sqlite3_errmsg(databaseInfo.pHandle)); } sqlite3_reset(pStmt); @@ -446,19 +446,19 @@ static int _db_select_ime_info_by_appid(const char *appid, ImeInfoDB *pImeInfo) ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return 0; } ret = sqlite3_bind_text(pStmt, 1, appid, -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_step(pStmt); if (ret != SQLITE_ROW) { - LOGE ("sqlite3_step: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } i = 1; @@ -497,7 +497,7 @@ static int _db_select_ime_info_by_appid(const char *appid, ImeInfoDB *pImeInfo) db_text = (char*)sqlite3_column_text(pStmt, 12); pImeInfo->display_lang = String(db_text ? db_text : ""); - SECURE_LOGD ("appid=\"%s\", label=\"%s\", pkgid=\"%s\", pkgtype=\"%s\", exec=\"%s\", mname=\"%s\", mpath=\"%s\", mode=%d, options=%u, is_enabled=%u, is_preinstalled=%u, has_option=%d, disp_lang=\"%s\"\n", + SECURE_LOGD ("appid=\"%s\", label=\"%s\", pkgid=\"%s\", pkgtype=\"%s\", exec=\"%s\", mname=\"%s\", mpath=\"%s\", mode=%d, options=%u, is_enabled=%u, is_preinstalled=%u, has_option=%d, disp_lang=\"%s\"", pImeInfo->appid.c_str(), pImeInfo->label.c_str(), pImeInfo->pkgid.c_str(), @@ -535,13 +535,13 @@ static int _db_select_module_name_by_mode(TOOLBAR_MODE_T mode, std::vector &ap ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return 0; } ret = sqlite3_bind_text(pStmt, 1, pkgid, -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } @@ -644,13 +644,13 @@ static int _db_select_appids_by_pkgid(const char *pkgid, std::vector &ap if (ret == SQLITE_ROW) { char *db_text = (char *)sqlite3_column_text(pStmt, 0); appids.push_back(String(db_text ? db_text : "")); - SECURE_LOGD ("appid=\"%s\"\n", appids.back().c_str()); + SECURE_LOGD ("appid=\"%s\"", appids.back().c_str()); i++; } } while (ret == SQLITE_ROW); if (ret != SQLITE_DONE) { - LOGE ("sqlite3_step: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step: %s", sqlite3_errmsg(databaseInfo.pHandle)); } out: @@ -679,24 +679,24 @@ static int _db_select_is_enabled_by_appid(const char *appid, bool *is_enabled) ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return i; } ret = sqlite3_bind_text(pStmt, 1, appid, -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_step(pStmt); if (ret != SQLITE_ROW) { - LOGE ("sqlite3_step: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step: %s", sqlite3_errmsg(databaseInfo.pHandle)); } else { *is_enabled = (bool)sqlite3_column_int(pStmt, 0); i = 1; - SECURE_LOGD ("is_enabled=%d by appid=\"%s\"\n", *is_enabled, appid); + SECURE_LOGD ("is_enabled=%d by appid=\"%s\"", *is_enabled, appid); } out: @@ -721,19 +721,19 @@ static int _db_select_count_by_module_name(const char *module_name) ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return 0; } ret = sqlite3_bind_text(pStmt, 1, module_name, -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_step(pStmt); if (ret != SQLITE_ROW) { - LOGE ("sqlite3_step: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step: %s", sqlite3_errmsg(databaseInfo.pHandle)); } else { i = sqlite3_column_int(pStmt, 0); @@ -761,37 +761,37 @@ static int _db_update_label_by_appid(const char *appid, const char *label) static const char* pQuery = "UPDATE ime_info SET label = ? WHERE appid = ?;"; if (appid == NULL || label == NULL) { - LOGE ("input is NULL.\n"); + LOGE ("input is NULL."); return 0; } ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return 0; } ret = sqlite3_bind_text(pStmt, 1, label, -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); ret = 0; goto out; } ret = sqlite3_bind_text(pStmt, 2, appid, -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); ret = 0; goto out; } ret = sqlite3_step(pStmt); if (ret != SQLITE_DONE) { - LOGE ("sqlite3_step returned %d, %s\n", ret, sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step returned %d, %s", ret, sqlite3_errmsg(databaseInfo.pHandle)); ret = 0; } else { - SECURE_LOGD ("UPDATE ime_info SET label = %s WHERE appid = %s;\n", label, appid); + SECURE_LOGD ("UPDATE ime_info SET label = %s WHERE appid = %s;", label, appid); ret = 1; } @@ -816,30 +816,30 @@ static int _db_update_disp_lang(const char *disp_lang) static const char* pQuery = "UPDATE ime_info SET disp_lang = ?;"; if (disp_lang == NULL) { - LOGE ("input is NULL.\n"); + LOGE ("input is NULL."); return 0; } ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return 0; } ret = sqlite3_bind_text(pStmt, 1, disp_lang, -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); ret = 0; goto out; } ret = sqlite3_step(pStmt); if (ret != SQLITE_DONE) { - LOGE ("sqlite3_step returned %d, %s\n", ret, sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step returned %d, %s", ret, sqlite3_errmsg(databaseInfo.pHandle)); ret = 0; } else { - SECURE_LOGD ("UPDATE ime_info SET disp_lang = %s;\n", disp_lang); + SECURE_LOGD ("UPDATE ime_info SET disp_lang = %s;", disp_lang); ret = 1; } @@ -866,36 +866,36 @@ static int _db_update_is_enabled_by_appid(const char *appid, bool is_enabled) static const char* pQuery = "UPDATE ime_info SET is_enabled = ? WHERE appid = ?;"; if (appid == NULL) { - LOGE ("input is NULL.\n"); + LOGE ("input is NULL."); return 0; } ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return 0; } ret = sqlite3_bind_int(pStmt, 1, (int)is_enabled); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_int: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_int: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 2, appid, -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); ret = 0; goto out; } ret = sqlite3_step(pStmt); if (ret != SQLITE_DONE) { - LOGE ("sqlite3_step returned %d, %s\n", ret, sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step returned %d, %s", ret, sqlite3_errmsg(databaseInfo.pHandle)); ret = 0; } else { - SECURE_LOGD ("UPDATE ime_info SET enabled = %d WHERE appid = %s;\n", is_enabled, appid); + SECURE_LOGD ("UPDATE ime_info SET enabled = %d WHERE appid = %s;", is_enabled, appid); ret = 1; } @@ -921,36 +921,36 @@ static int _db_update_has_option_by_appid(const char *appid, bool has_option) static const char* pQuery = "UPDATE ime_info SET has_option = ? WHERE appid = ?;"; if (appid == NULL) { - LOGE ("input is NULL.\n"); + LOGE ("input is NULL."); return 0; } ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return 0; } ret = sqlite3_bind_int(pStmt, 1, (int)has_option); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_int: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_int: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 2, appid, -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); ret = 0; goto out; } ret = sqlite3_step(pStmt); if (ret != SQLITE_DONE) { - LOGE ("sqlite3_step returned %d, %s\n", ret, sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step returned %d, %s", ret, sqlite3_errmsg(databaseInfo.pHandle)); ret = 0; } else { - SECURE_LOGD ("UPDATE ime_info SET enabled = %d WHERE appid = %s;\n", has_option, appid); + SECURE_LOGD ("UPDATE ime_info SET enabled = %d WHERE appid = %s;", has_option, appid); ret = 1; } @@ -975,37 +975,37 @@ static int _db_update_ime_info(ImeInfoDB *ime_db) static const char* pQuery = "UPDATE ime_info SET label = ?, exec = ?, mname = ?, mpath = ?, has_option = ? WHERE appid = ?;"; if (!ime_db) { - LOGE ("Input parameter is null\n"); + LOGE ("Input parameter is null"); return 0; } ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return i; } ret = sqlite3_bind_text(pStmt, 1, ime_db->label.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 2, ime_db->exec.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 3, ime_db->module_name.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 4, ime_db->module_path.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } @@ -1018,13 +1018,13 @@ static int _db_update_ime_info(ImeInfoDB *ime_db) ret = sqlite3_bind_int(pStmt, 5, has_option); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_int: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_int: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 6, ime_db->appid.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } @@ -1035,7 +1035,7 @@ static int _db_update_ime_info(ImeInfoDB *ime_db) goto out; } else { - SECURE_LOGD ("Update \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n", + SECURE_LOGD ("Update \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"", ime_db->appid.c_str(), ime_db->label.c_str(), ime_db->exec.c_str(), ime_db->module_name.c_str(), ime_db->module_path.c_str()); ret = SQLITE_OK; i++; @@ -1067,102 +1067,102 @@ static int _db_insert_ime_info(ImeInfoDB *ime_db) static const char* pQuery = "INSERT INTO ime_info (appid, label, pkgid, pkgtype, exec, mname, mpath, mode, options, is_enabled, is_preinstalled, has_option, disp_lang) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);"; if (!ime_db) { - LOGE ("Input parameter is null\n"); + LOGE ("Input parameter is null"); return 0; } ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return i; } ret = sqlite3_bind_text(pStmt, 1, ime_db->appid.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 2, ime_db->label.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 3, ime_db->pkgid.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 4, ime_db->pkgtype.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 5, ime_db->exec.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 6, ime_db->module_name.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 7, ime_db->module_path.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_int(pStmt, 8, ime_db->mode); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_int: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_int: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_int(pStmt, 9, (int)ime_db->options); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_int: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_int: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_int(pStmt, 10, (int)ime_db->is_enabled); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_int: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_int: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_int(pStmt, 11, (int)ime_db->is_preinstalled); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_int: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_int: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_int(pStmt, 12, ime_db->has_option); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_int: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_int: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_bind_text(pStmt, 13, ime_db->display_lang.c_str(), -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_step(pStmt); if (ret != SQLITE_DONE) { - LOGW ("sqlite3_step returned %d, appid=%s, %s\n", ret, ime_db->appid.c_str(), sqlite3_errmsg(databaseInfo.pHandle)); + LOGW ("sqlite3_step returned %d, appid=%s, %s", ret, ime_db->appid.c_str(), sqlite3_errmsg(databaseInfo.pHandle)); ret = SQLITE_ERROR; goto out; } else { - SECURE_LOGD ("Insert \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" %d %u %u %u %d \"%s\"\n", + SECURE_LOGD ("Insert \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" \"%s\" %d %u %u %u %d \"%s\"", ime_db->appid.c_str(), ime_db->label.c_str(), ime_db->pkgid.c_str(), ime_db->pkgtype.c_str(), ime_db->module_name.c_str(), ime_db->exec.c_str(), ime_db->module_path.c_str(), ime_db->mode, ime_db->options, ime_db->is_enabled, ime_db->is_preinstalled, ime_db->has_option, ime_db->display_lang.c_str()); @@ -1197,23 +1197,23 @@ static int _db_delete_ime_info_by_pkgid(const char *pkgid) ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return i; } ret = sqlite3_bind_text(pStmt, 1, pkgid, -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_step(pStmt); if (ret != SQLITE_DONE) { - LOGE ("sqlite3_step returned %d, %s\n", ret, sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step returned %d, %s", ret, sqlite3_errmsg(databaseInfo.pHandle)); } else { // If there is no pkgid to delete, ret is still SQLITE_DONE. - SECURE_LOGD ("DELETE FROM ime_info WHERE pkgid = %s;\n", pkgid); + SECURE_LOGD ("DELETE FROM ime_info WHERE pkgid = %s;", pkgid); i = 1; } @@ -1239,23 +1239,23 @@ static int _db_delete_ime_info_by_appid(const char *appid) ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return i; } ret = sqlite3_bind_text(pStmt, 1, appid, -1, SQLITE_TRANSIENT); if (ret != SQLITE_OK) { - LOGE ("sqlite3_bind_text: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_bind_text: %s", sqlite3_errmsg(databaseInfo.pHandle)); goto out; } ret = sqlite3_step(pStmt); if (ret != SQLITE_DONE) { - LOGE ("sqlite3_step returned %d, %s\n", ret, sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step returned %d, %s", ret, sqlite3_errmsg(databaseInfo.pHandle)); } else { // If there is no appid to delete, ret is still SQLITE_DONE. - SECURE_LOGD ("DELETE FROM ime_info WHERE appid = %s;\n", appid); + SECURE_LOGD ("DELETE FROM ime_info WHERE appid = %s;", appid); i = 1; } @@ -1279,17 +1279,17 @@ static int _db_delete_ime_info(void) ret = sqlite3_prepare_v2(databaseInfo.pHandle, pQuery, -1, &pStmt, NULL); if (ret != SQLITE_OK) { - LOGE ("sqlite3_prepare_v2: %s\n", sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_prepare_v2: %s", sqlite3_errmsg(databaseInfo.pHandle)); return i; } ret = sqlite3_step(pStmt); if (ret != SQLITE_DONE) { - LOGE ("sqlite3_step returned %d, %s\n", ret, sqlite3_errmsg(databaseInfo.pHandle)); + LOGE ("sqlite3_step returned %d, %s", ret, sqlite3_errmsg(databaseInfo.pHandle)); } else { // If there is no pkgid to delete, ret is still SQLITE_DONE. - SECURE_LOGD ("DELETE FROM ime_info;\n"); + SECURE_LOGD ("DELETE FROM ime_info;"); i = 1; } @@ -1317,7 +1317,7 @@ EXAPI int isf_db_select_all_ime_info(std::vector &ime_info) _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1335,7 +1335,7 @@ EXAPI int isf_db_select_ime_info_by_appid(const char *appid, ImeInfoDB *pImeInfo int ret = 0; if (!appid || !pImeInfo) { - LOGW ("invalid parameter.\n"); + LOGW ("invalid parameter."); return 0; } @@ -1344,7 +1344,7 @@ EXAPI int isf_db_select_ime_info_by_appid(const char *appid, ImeInfoDB *pImeInfo _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1368,7 +1368,7 @@ EXAPI int isf_db_select_module_name_by_mode(TOOLBAR_MODE_T mode, std::vector & appids.clear(); if (!pkgid) { - LOGW ("pkgid is null.\n"); + LOGW ("pkgid is null."); return ret; } @@ -1421,7 +1421,7 @@ EXAPI int isf_db_select_appids_by_pkgid(const char *pkgid, std::vector & _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1439,7 +1439,7 @@ EXAPI int isf_db_select_is_enabled_by_appid(const char *appid, bool *is_enabled) int ret = 0; if (!appid || !is_enabled) { - LOGW ("Input parameter is null.\n"); + LOGW ("Input parameter is null."); return ret; } @@ -1448,7 +1448,7 @@ EXAPI int isf_db_select_is_enabled_by_appid(const char *appid, bool *is_enabled) _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1466,7 +1466,7 @@ EXAPI int isf_db_select_count_by_module_name(const char *module_name) int ret = 0; if (!module_name) { - LOGW ("module_name is null.\n"); + LOGW ("module_name is null."); return ret; } @@ -1475,7 +1475,7 @@ EXAPI int isf_db_select_count_by_module_name(const char *module_name) _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1493,7 +1493,7 @@ EXAPI int isf_db_update_label_by_appid(const char *appid, const char *label) int ret = 0; if (!appid || !label) { - LOGW ("Input parameter is null.\n"); + LOGW ("Input parameter is null."); return ret; } @@ -1502,7 +1502,7 @@ EXAPI int isf_db_update_label_by_appid(const char *appid, const char *label) _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1519,7 +1519,7 @@ EXAPI int isf_db_update_disp_lang(const char *disp_lang) int ret = 0; if (!disp_lang) { - LOGW ("Input parameter is null.\n"); + LOGW ("Input parameter is null."); return ret; } @@ -1528,7 +1528,7 @@ EXAPI int isf_db_update_disp_lang(const char *disp_lang) _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1546,7 +1546,7 @@ EXAPI int isf_db_update_is_enabled_by_appid(const char *appid, bool is_enabled) int ret = 0; if (!appid) { - LOGW ("Input parameter is null.\n"); + LOGW ("Input parameter is null."); return ret; } @@ -1555,7 +1555,7 @@ EXAPI int isf_db_update_is_enabled_by_appid(const char *appid, bool is_enabled) _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1573,7 +1573,7 @@ EXAPI int isf_db_update_has_option_by_appid(const char *appid, bool has_option) int ret = 0; if (!appid) { - LOGW ("Input parameter is null.\n"); + LOGW ("Input parameter is null."); return ret; } @@ -1582,7 +1582,7 @@ EXAPI int isf_db_update_has_option_by_appid(const char *appid, bool has_option) _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1599,7 +1599,7 @@ EXAPI int isf_db_update_ime_info(ImeInfoDB *ime_db, bool in_transaction) int ret = 0; if (!ime_db) { - LOGW ("Input parameter is null.\n"); + LOGW ("Input parameter is null."); return ret; } @@ -1608,7 +1608,7 @@ EXAPI int isf_db_update_ime_info(ImeInfoDB *ime_db, bool in_transaction) if (!in_transaction) _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1633,8 +1633,8 @@ EXAPI int isf_db_insert_ime_info(ImeInfoDB *ime_db, bool in_transaction) if (!in_transaction) _db_disconnect(); } else { - LOGE ("_db_connect() failed\n"); - ISF_SAVE_LOG("_db_connect() failed\n"); + LOGE ("_db_connect() failed"); + ISF_SAVE_LOG("_db_connect() failed"); } return ret; @@ -1652,7 +1652,7 @@ EXAPI int isf_db_delete_ime_info_by_pkgid(const char *pkgid) int ret = 0; if (!pkgid) { - LOGW ("Input parameter is null.\n"); + LOGW ("Input parameter is null."); return ret; } @@ -1661,7 +1661,7 @@ EXAPI int isf_db_delete_ime_info_by_pkgid(const char *pkgid) _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1678,7 +1678,7 @@ EXAPI int isf_db_delete_ime_info_by_appid(const char *appid) int ret = 0; if (!appid) { - LOGW ("Input parameter is null.\n"); + LOGW ("Input parameter is null."); return ret; } @@ -1687,7 +1687,7 @@ EXAPI int isf_db_delete_ime_info_by_appid(const char *appid) _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1706,7 +1706,7 @@ EXAPI int isf_db_delete_ime_info(void) _db_disconnect(); } else - LOGW ("failed\n"); + LOGW ("failed"); return ret; } @@ -1743,7 +1743,7 @@ EXAPI int isf_db_begin_transaction(void) ret = _begin_transaction(); } } else - LOGW("failed\n"); + LOGW("failed"); return (ret == EXIT_SUCCESS); } @@ -1761,7 +1761,7 @@ EXAPI int isf_db_commit_transaction(void) ret = _commit_transaction(); _db_disconnect(); } else - LOGW("failed\n"); + LOGW("failed"); return (ret == EXIT_SUCCESS); } @@ -1779,7 +1779,7 @@ EXAPI int isf_db_rollback_transaction(void) ret = _rollback_transaction(); _db_disconnect(); } else - LOGW("failed\n"); + LOGW("failed"); return (ret == EXIT_SUCCESS); } diff --git a/ism/src/isf_remote_client.cpp b/ism/src/isf_remote_client.cpp index ed1ead7..bfbb5f0 100644 --- a/ism/src/isf_remote_client.cpp +++ b/ism/src/isf_remote_client.cpp @@ -257,14 +257,14 @@ public: m_trans.put_data (str, strlen (str)+1); m_trans.write_to_socket (m_socket_remoteinput2panel); if (!m_trans.read_from_socket (m_socket_remoteinput2panel, m_socket_timeout)) { - LOGE ("REMOTE_CLIENT_ERROR_TIMEOUT\n"); + LOGE ("REMOTE_CLIENT_ERROR_TIMEOUT"); return REMOTE_CLIENT_ERROR_TIMEOUT; } if (m_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY && m_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK) { } else { - LOGE ("REMOTE_CLIENT_ERROR_REQUEST_DENIED\n"); + LOGE ("REMOTE_CLIENT_ERROR_REQUEST_DENIED"); return REMOTE_CLIENT_ERROR_REQUEST_DENIED; } @@ -280,14 +280,14 @@ public: m_trans.put_command (ISM_REMOTE_TRANS_CMD_CHECK_PRIVILEGE); m_trans.write_to_socket (m_socket_remoteinput2panel); if (!m_trans.read_from_socket (m_socket_remoteinput2panel, m_socket_timeout)) { - LOGE ("REMOTE_CLIENT_ERROR_TIMEOUT\n"); + LOGE ("REMOTE_CLIENT_ERROR_TIMEOUT"); return REMOTE_CLIENT_ERROR_TIMEOUT; } if (m_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY && m_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK) { } else { - LOGE ("REMOTE_CLIENT_ERROR_PERMISSION_DENIED\n"); + LOGE ("REMOTE_CLIENT_ERROR_PERMISSION_DENIED"); return REMOTE_CLIENT_ERROR_PERMISSION_DENIED; } @@ -305,14 +305,14 @@ public: m_trans.put_data (len); m_trans.write_to_socket (m_socket_remoteinput2panel); if (!m_trans.read_from_socket (m_socket_remoteinput2panel, m_socket_timeout)) { - LOGE ("REMOTE_CLIENT_ERROR_TIMEOUT\n"); + LOGE ("REMOTE_CLIENT_ERROR_TIMEOUT"); return REMOTE_CLIENT_ERROR_TIMEOUT; } if (m_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_REPLY && m_trans.get_command (cmd) && cmd == SCIM_TRANS_CMD_OK) { } else { - LOGE ("REMOTE_CLIENT_ERROR_REQUEST_DENIED\n"); + LOGE ("REMOTE_CLIENT_ERROR_REQUEST_DENIED"); return REMOTE_CLIENT_ERROR_REQUEST_DENIED; } @@ -330,13 +330,13 @@ public: int cmd; if (! m_trans_recv.get_command (cmd) || cmd != SCIM_TRANS_CMD_REPLY) { - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); return REMOTE_CONTROL_CALLBACK_ERROR; } remote_control_callback_type type = REMOTE_CONTROL_CALLBACK_ERROR; while (m_trans_recv.get_command (cmd)) { - LOGD ("RemoteInput_Client::cmd = %d\n", cmd); + LOGD ("RemoteInput_Client::cmd = %d", cmd); switch (cmd) { case ISM_REMOTE_TRANS_CMD_RECV_FOCUS_IN: { @@ -356,7 +356,7 @@ public: m_trans_recv.get_data (m_autocapital_type) && m_trans_recv.get_data (m_return_key_disabled)) { } else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } case ISM_REMOTE_TRANS_CMD_RECV_SURROUNDING_TEXT: @@ -366,7 +366,7 @@ public: if (m_trans_recv.get_data (m_surrounding_text) && m_trans_recv.get_data (m_cursor)) { } else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } case ISM_REMOTE_TRANS_CMD_RECV_INPUT_RESOURCE: @@ -376,7 +376,7 @@ public: if (m_trans_recv.get_data (m_input_resource)) { } else - LOGW ("wrong format of transaction\n"); + LOGW ("wrong format of transaction"); break; } default: diff --git a/ism/src/isf_remote_control.cpp b/ism/src/isf_remote_control.cpp index 56ef863..d688b6a 100644 --- a/ism/src/isf_remote_control.cpp +++ b/ism/src/isf_remote_control.cpp @@ -119,11 +119,11 @@ remote_handler(GIOChannel *source, GIOCondition condition, gpointer user_data) break; } } else { - LOGE ("Failed to receive callback message\n"); + LOGE ("Failed to receive callback message"); return (gboolean)FALSE; } } else if (condition == G_IO_ERR || condition == G_IO_HUP) { - LOGE ("Failed to receive callback message\n"); + LOGE ("Failed to receive callback message"); return (gboolean)FALSE; } diff --git a/ism/src/scim.cpp b/ism/src/scim.cpp index d3d3f10..6f1bf01 100644 --- a/ism/src/scim.cpp +++ b/ism/src/scim.cpp @@ -140,7 +140,7 @@ static char _ise_uuid[_POSIX_PATH_MAX + 1] = {0}; static void launch_helper (const char *name, const char *uuid) { if (!name || !uuid) { - ISF_SAVE_LOG ("Invalid parameter\n"); + ISF_SAVE_LOG ("Invalid parameter"); return; } @@ -174,7 +174,7 @@ static void launch_helper (const char *name, const char *uuid) _ise_uuid, 0}; - ISF_SAVE_LOG ("Exec scim_helper_launcher(%s %s)\n", _ise_name, _ise_uuid); + ISF_SAVE_LOG ("Exec scim_helper_launcher(%s %s)", _ise_name, _ise_uuid); setsid (); execv (SCIM_HELPER_LAUNCHER_PROGRAM, const_cast(argv)); @@ -455,7 +455,7 @@ int main (int argc, char *argv []) new_argv [new_argc] = 0; - ISF_SAVE_LOG ("ppid:%d Starting SCIM......\n", getppid ()); + ISF_SAVE_LOG ("ppid:%d Starting SCIM......", getppid ()); /* Get the imengine module list which should be loaded. */ if (exclude_engine_list.size ()) { @@ -510,7 +510,7 @@ int main (int argc, char *argv []) } } catch (scim::Exception &e) { cerr << e.what () << "\n"; - ISF_SAVE_LOG ("catch: %s\n", e.what ()); + ISF_SAVE_LOG ("catch: %s", e.what ()); } /* If there is one Socket FrontEnd running and it's not manual mode, @@ -529,7 +529,7 @@ int main (int argc, char *argv []) } } catch (scim::Exception &e) { cerr << e.what () << "\n"; - ISF_SAVE_LOG ("catch: %s\n", e.what ()); + ISF_SAVE_LOG ("catch: %s", e.what ()); } } @@ -562,7 +562,7 @@ int main (int argc, char *argv []) } } catch (scim::Exception & e) { cerr << e.what () << "\n"; - ISF_SAVE_LOG ("Fail to launch panel. error: %s\n", e.what ()); + ISF_SAVE_LOG ("Fail to launch panel. error: %s", e.what ()); } run_broker (argc, argv); diff --git a/ism/src/scim_helper.cpp b/ism/src/scim_helper.cpp index 3abea17..9c26674 100644 --- a/ism/src/scim_helper.cpp +++ b/ism/src/scim_helper.cpp @@ -635,7 +635,7 @@ HelperAgent::open_connection (const HelperInfo &info, } std::cerr << " Connected :" << i << "\n"; ISF_LOG (" Connected :%d\n", i); - LOGD ("Connection to PanelAgent succeeded, %d\n", i); + LOGD ("Connection to PanelAgent succeeded, %d", i); /* Let's retry 10 times when failed */ int open_connection_retries = 0; @@ -648,7 +648,7 @@ HelperAgent::open_connection (const HelperInfo &info, m_impl->socket.close (); std::cerr << "scim_socket_open_connection () is failed!!!\n"; ISF_LOG ("scim_socket_open_connection () is failed!!!\n"); - ISF_SAVE_LOG ("scim_socket_open_connection failed, %d\n", timeout); + ISF_SAVE_LOG ("scim_socket_open_connection failed, %d", timeout); return -1; } @@ -665,7 +665,7 @@ HelperAgent::open_connection (const HelperInfo &info, } ISF_LOG ("scim_socket_open_connection () is successful.\n"); - LOGD ("scim_socket_open_connection successful\n"); + LOGD ("scim_socket_open_connection successful"); m_impl->send.clear (); m_impl->send.put_command (SCIM_TRANS_CMD_REQUEST); @@ -714,7 +714,7 @@ HelperAgent::open_connection (const HelperInfo &info, LOGW ("Attach input context and update screen failed"); } - ISF_SAVE_LOG ("Trying connect() with Helper_Active\n"); + ISF_SAVE_LOG ("Trying connect() with Helper_Active"); /* connect to the panel agent as the active helper client */ if (!m_impl->socket_active.connect (address)) return -1; @@ -728,7 +728,7 @@ HelperAgent::open_connection (const HelperInfo &info, m_impl->socket_active.close (); std::cerr << "Helper_Active scim_socket_open_connection () is failed!!!\n"; ISF_LOG ("Helper_Active scim_socket_open_connection () is failed!!!\n"); - ISF_SAVE_LOG ("Helper_Active scim_socket_open_connection failed, %d\n", timeout); + ISF_SAVE_LOG ("Helper_Active scim_socket_open_connection failed, %d", timeout); return -1; } @@ -757,7 +757,7 @@ HelperAgent::open_connection (const HelperInfo &info, m_impl->send.put_data (info.option); if (!m_impl->send.write_to_socket (m_impl->socket_active, magic)) { - ISF_SAVE_LOG ("Helper_Active write_to_socket() failed\n"); + ISF_SAVE_LOG ("Helper_Active write_to_socket() failed"); m_impl->socket_active.close (); return -1; } @@ -904,12 +904,12 @@ HelperAgent::handle_message (MessageItem *message) return false; int cmd = message->get_command_ref(); - LOGD ("HelperAgent::cmd = %d\n", cmd); + LOGD ("HelperAgent::cmd = %d", cmd); switch (cmd) { case SCIM_TRANS_CMD_EXIT: { MessageItemExit *subclass = static_cast(message); - ISF_SAVE_LOG ("Helper ISE received SCIM_TRANS_CMD_EXIT message\n"); + ISF_SAVE_LOG ("Helper ISE received SCIM_TRANS_CMD_EXIT message"); m_impl->signal_exit(this, subclass->get_ic_ref(), subclass->get_ic_uuid_ref()); break; } @@ -1031,7 +1031,7 @@ HelperAgent::handle_message (MessageItem *message) case ISM_TRANS_CMD_SHOW_ISE_PANEL: { MessageItemShowISEPanel *subclass = static_cast(message); - LOGD ("Helper ISE received ISM_TRANS_CMD_SHOW_ISE_PANEL message\n"); + LOGD ("Helper ISE received ISM_TRANS_CMD_SHOW_ISE_PANEL message"); m_impl->signal_ise_show (this, subclass->get_ic_ref(), *(subclass->get_data_ptr()), subclass->get_len_ref()); @@ -1041,7 +1041,7 @@ HelperAgent::handle_message (MessageItem *message) case ISM_TRANS_CMD_HIDE_ISE_PANEL: { MessageItemHideISEPanel *subclass = static_cast(message); - LOGD ("Helper ISE received ISM_TRANS_CMD_HIDE_ISE_PANEL message\n"); + LOGD ("Helper ISE received ISM_TRANS_CMD_HIDE_ISE_PANEL message"); m_impl->signal_ise_hide (this, subclass->get_ic_ref(), subclass->get_ic_uuid_ref()); m_impl->ise_show_flag = false; break; @@ -2345,7 +2345,7 @@ HelperAgent::set_keyboard_ise_by_uuid (const String &uuid) const static int instance_count = 1; if ((!m_impl->si.null ()) && m_impl->si->get_factory_uuid () == uuid) { - ISF_SAVE_LOG ("Already in UUID: %s\n", uuid.c_str()); + ISF_SAVE_LOG ("Already in UUID: %s", uuid.c_str()); return; } diff --git a/ism/src/scim_helper_launcher.cpp b/ism/src/scim_helper_launcher.cpp index 7ee53aa..fdc902b 100644 --- a/ism/src/scim_helper_launcher.cpp +++ b/ism/src/scim_helper_launcher.cpp @@ -154,10 +154,10 @@ int main (int argc, char *argv []) } SCIM_DEBUG_MAIN(1) << "scim-helper-launcher: " << config << " " << display << " " << helper << " " << appid << "\n"; - ISF_SAVE_LOG ("Helper ISE (%s %s) is launching...\n", helper.c_str (), appid.c_str ()); + ISF_SAVE_LOG ("Helper ISE (%s %s) is launching...", helper.c_str (), appid.c_str ()); if (!helper.length ()) { - ISF_SAVE_LOG ("Module name is missing\n"); + ISF_SAVE_LOG ("Module name is missing"); std::cerr << "Module name is missing.\n"; return -1; @@ -166,7 +166,7 @@ int main (int argc, char *argv []) HelperModule helper_module (helper); if (!helper_module.valid () || helper_module.number_of_helpers () == 0) { - ISF_SAVE_LOG ("Unable to load helper module(%s)\n", helper.c_str ()); + ISF_SAVE_LOG ("Unable to load helper module(%s)", helper.c_str ()); std::cerr << "Unable to load helper module(" << helper << ")\n"; return -1; @@ -187,7 +187,7 @@ int main (int argc, char *argv []) if (!config_pointer.null ()) config_pointer.reset (); ConfigBase::set (0); - ISF_SAVE_LOG ("Helper ISE (%s) is destroyed!!!\n", appid.c_str ()); + ISF_SAVE_LOG ("Helper ISE (%s) is destroyed!!!", appid.c_str ()); } /* diff --git a/ism/src/scim_launcher.cpp b/ism/src/scim_launcher.cpp index 635e151..c9351a0 100644 --- a/ism/src/scim_launcher.cpp +++ b/ism/src/scim_launcher.cpp @@ -78,7 +78,7 @@ void signalhandler (int sig) config_module = 0; } - ISF_SAVE_LOG ("sig:%d\n", sig); + ISF_SAVE_LOG ("sig:%d", sig); std::cerr << "Successfully exited.\n"; exit (0); @@ -105,7 +105,7 @@ int main (int argc, char *argv []) new_argv [new_argc ++] = argv [0]; - ISF_SAVE_LOG ("Start scim-launcher\n"); + ISF_SAVE_LOG ("Start scim-launcher"); while (i < argc) { if (++i >= argc) break; @@ -326,7 +326,7 @@ int main (int argc, char *argv []) /* reset backend pointer, in order to destroy backend automatically. */ backend.reset (); - ISF_SAVE_LOG ("now running frontend...\n"); + ISF_SAVE_LOG ("now running frontend..."); frontend_module->run (); diff --git a/ism/src/scim_socket.cpp b/ism/src/scim_socket.cpp index 9afb080..3abae3a 100644 --- a/ism/src/scim_socket.cpp +++ b/ism/src/scim_socket.cpp @@ -544,12 +544,12 @@ public: if (fcntl (m_id, F_SETFL, flags | O_NONBLOCK) == -1) { char buf_err[256]; m_err = errno; - LOGW ("ppid : %d fcntl() failed, %d %s\n", getppid (), m_err, strerror_r (m_err, buf_err, sizeof (buf_err))); + LOGW ("ppid : %d fcntl() failed, %d %s", getppid (), m_err, strerror_r (m_err, buf_err, sizeof (buf_err))); } char proc_name[17] = {0}; /* the buffer provided shall at least be 16+1 bytes long */ if (-1 != prctl (PR_GET_NAME, proc_name, 0, 0, 0)) { - LOGD ("ppid:%d trying connect() to %s, %s\n", getppid (), addr.get_address ().c_str (), proc_name); + LOGD ("ppid:%d trying connect() to %s, %s", getppid (), addr.get_address ().c_str (), proc_name); } if ((m_err = ::connect (m_id, data, len)) == 0) { @@ -558,7 +558,7 @@ public: } m_address = addr; - LOGD ("connect() succeeded\n"); + LOGD ("connect() succeeded"); return true; } @@ -575,15 +575,15 @@ public: tval.tv_sec = nsec; tval.tv_usec = 0; - LOGW ("EINPROGRESS, select() with timeout %d\n", nsec); + LOGW ("EINPROGRESS, select() with timeout %d", nsec); if (select (m_id + 1, &rset, &wset, NULL, nsec ? &tval : NULL) == 0) { m_err = ETIMEDOUT; - LOGW ("timeout in select()\n"); + LOGW ("timeout in select()"); } else { // We've got something, connection succeeded - LOGD ("finally connected\n"); + LOGD ("finally connected"); if (fcntl (m_id, F_SETFL, flags) == -1) { m_err = errno; @@ -594,7 +594,7 @@ public: } else { char buf_err[256]; m_err = errno; - LOGW ("connect() failed with %d (%s)\n", m_err, strerror_r (m_err, buf_err, sizeof (buf_err))); + LOGW ("connect() failed with %d (%s)", m_err, strerror_r (m_err, buf_err, sizeof (buf_err))); } if (fcntl (m_id, F_SETFL, flags) == -1) { m_err = errno; @@ -1568,9 +1568,9 @@ scim_socket_open_connection (uint32 &key, if (trans.write_to_socket (socket)) return true; else - LOGW ("write_to_socket() failed\n"); + LOGW ("write_to_socket() failed"); } else { - LOGW ("read_from_socket() failed %d\n", timeout); + LOGW ("read_from_socket() failed %d", timeout); trans.clear (); trans.put_command (SCIM_TRANS_CMD_REPLY); @@ -1578,7 +1578,7 @@ scim_socket_open_connection (uint32 &key, trans.write_to_socket (socket); } } else { - LOGW ("write_to_socket() failed\n"); + LOGW ("write_to_socket() failed"); } return false; @@ -1620,13 +1620,13 @@ scim_socket_accept_connection (uint32 &key, // Client is ok, return the client type. return (client_type == "ConnectionTester") ? String ("") : client_type; } else { - LOGW ("write_to_socket() failed\n"); + LOGW ("write_to_socket() failed"); } } else { - LOGW ("wrong format of SCIM_TRANS_CMD_OPEN_CONNECTION transaction\n"); + LOGW ("wrong format of SCIM_TRANS_CMD_OPEN_CONNECTION transaction"); } } else { - LOGW ("read_from_socket() failed %d\n", timeout); + LOGW ("read_from_socket() failed %d", timeout); } return String (""); } diff --git a/ism/src/scim_utility.cpp b/ism/src/scim_utility.cpp index eceb7f0..68e2a89 100644 --- a/ism/src/scim_utility.cpp +++ b/ism/src/scim_utility.cpp @@ -659,7 +659,7 @@ scim_get_home_dir () if (result && pw.pw_dir) { home_dir = pw.pw_dir; } else { - LOGD ("Fail to getpwuid_r\n"); + LOGD ("Fail to getpwuid_r"); } if (!home_dir) { @@ -1210,7 +1210,7 @@ EXAPI int scim_launch (bool daemon, child_pid = fork (); - ISF_SAVE_LOG ("ppid: %d, fork result : %d, user %s\n", getppid (), child_pid, scim_get_user_name ().c_str ()); + ISF_SAVE_LOG ("ppid: %d, fork result : %d, user %s", getppid (), child_pid, scim_get_user_name ().c_str ()); // Error fork. if (child_pid < 0) { @@ -1309,7 +1309,7 @@ EXAPI int scim_launch_panel (bool daemon, child_pid = fork (); - ISF_SAVE_LOG ("ppid : %d fork result : %d\n", getppid (), child_pid); + ISF_SAVE_LOG ("ppid : %d fork result : %d", getppid (), child_pid); // Error fork. if (child_pid < 0) { @@ -1385,12 +1385,12 @@ scim_usleep (unsigned int usec) EXAPI void scim_daemon () { #if HAVE_DAEMON - LOGD ("ppid:%d calling daemon()\n", getppid ()); + LOGD ("ppid:%d calling daemon()", getppid ()); if (daemon (0, 0) == -1) std::cerr << "Error to make SCIM into a daemon!\n"; - LOGD ("ppid:%d daemon() called\n", getppid ()); + LOGD ("ppid:%d daemon() called", getppid ()); return; #else @@ -1404,7 +1404,7 @@ EXAPI void scim_daemon () _exit (0); } - ISF_SAVE_LOG ("ppid:%d fork result : %d\n", getppid (), id); + ISF_SAVE_LOG ("ppid:%d fork result : %d", getppid (), id); id = fork (); if (id == -1) { @@ -1414,7 +1414,7 @@ EXAPI void scim_daemon () _exit (0); } - ISF_SAVE_LOG ("ppid:%d fork result : %d\n", getppid (), id); + ISF_SAVE_LOG ("ppid:%d fork result : %d", getppid (), id); return; #endif @@ -1439,7 +1439,7 @@ EXAPI void isf_save_log (const char *fmt, ...) if (ret == 0 || (ret == -1 && errno == ENOENT)) { if (st.st_size < MAX_LOG_FILE_SIZE) { std::ofstream isf_log_file (strLogFile.c_str (), std::ios::app); - isf_log_file << buf; + isf_log_file << buf << std::endl; isf_log_file.flush (); } else { size_exceeded = true; @@ -1447,7 +1447,7 @@ EXAPI void isf_save_log (const char *fmt, ...) } } - LOGD ("%s\n", buf); + LOGD ("%s", buf); } static struct timeval _t0 = {0, 0};