Replace ERR with _E macro.

Change-Id: I95833b377368e6f631753148e5bee73af1033a5e
Signed-off-by: Radoslaw Czerski <r.czerski@samsung.com>

19 files changed, 73 insertions, 69 deletions

diff --git a/src/box.c b/src/box.c
index bc69153..4e94ffa 100644
--- a/src/box.c
+++ b/src/box.c
@@ -993,7 +993,7 @@ int box_handle_animated_gif(icon_s *icon)
 
 	int ret = device_display_get_state(&state);
 	if (ret != DEVICE_ERROR_NONE) {
-		ERR("device_display_get_state failed: %s", get_error_message(ret));
+		_E("device_display_get_state failed: %s", get_error_message(ret));
 		return FAIL;
 	}
 
diff --git a/src/main.c b/src/main.c
index a5084ac..e63577a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1005,7 +1005,7 @@ static void _app_terminate_cb(app_context_h app_context, app_context_status_e st
 	char *app_id = NULL;
 	app_context_get_app_id(app_context, &app_id);
 	if (app_id == NULL) {
-		ERR("app_id is null!!");
+		_E("app_id is null!!");
 		return;
 	} else {
 		_D("_app_terminate_cb %s",app_id);
diff --git a/src/message.c b/src/message.c
index 979834c..195eb22 100644
--- a/src/message.c
+++ b/src/message.c
@@ -341,7 +341,7 @@ static void __handle_2line(win_info* win,char* origin, char* part1, char* part2)
 
 	if(exceed_index<0)
 	{
-		ERR("INDEX %d",exceed_index);
+		_E("INDEX %d",exceed_index);
 		goto __CATCH;
 	}
 
@@ -576,7 +576,7 @@ static void __buffer_msg_callback(const char *message, void *data)
 	{
 		if(current_buf_cnt>=QUEUE_SIZE)
 		{
-			ERR("QUEUE FULL");
+			_E("QUEUE FULL");
 			return;
 		}
 		if(msg_queue[current_buf_cnt].data!=NULL)
diff --git a/src/modules/clock/clock.c b/src/modules/clock/clock.c
index 254e499..7398433 100644
--- a/src/modules/clock/clock.c
+++ b/src/modules/clock/clock.c
@@ -485,7 +485,7 @@ void indicator_get_apm_by_region(char* output,void *data)
 	i18n_udate date;
 	ret = i18n_ucalendar_get_now(&date);
 	if (ret != I18N_ERROR_NONE) {
-		ERR("i18n_ucalendar_get_now failed: %d", ret);
+		_E("i18n_ucalendar_get_now failed: %d", ret);
 		free(locale);
 		free(timezone_id);
 		return;
@@ -564,7 +564,7 @@ void indicator_get_time_by_region(char* output,void *data)
 	_D("Locale: %s", locale);
 
 	if (locale == NULL) {
-		ERR("[Error] get value of fail.");
+		_E("[Error] get value of fail.");
 		return;
 	}
 
@@ -600,7 +600,7 @@ void indicator_get_time_by_region(char* output,void *data)
 	i18n_udate date;
 	ret = i18n_ucalendar_get_now(&date);
 	if (ret != I18N_ERROR_NONE) {
-		ERR("i18n_ucalendar_get_now failed: %d", ret);
+		_E("i18n_ucalendar_get_now failed: %d", ret);
 		free(locale);
 		return;
 	}
@@ -664,19 +664,19 @@ static void ICU_set_timezone(const char *timezone)
 	i18n_timezone_h tmz;
 
 	if (timezone == NULL) {
-		ERR("TIMEZONE is NULL");
+		_E("TIMEZONE is NULL");
 		return;
 	}
 
 	int ret = i18n_timezone_create(&tmz, timezone);
 	if (ret != I18N_ERROR_NONE) {
-		ERR("Unable to create timezone handle from %s: %d", timezone, ret);
+		_E("Unable to create timezone handle from %s: %d", timezone, ret);
 		return;
 	}
 
 	ret = i18n_timezone_set_default(tmz);
 	if (ret != I18N_ERROR_NONE) {
-		ERR("Unable to set default timezone to %s: %d", timezone, ret);
+		_E("Unable to set default timezone to %s: %d", timezone, ret);
 	}
 
 	i18n_timezone_destroy(tmz);
diff --git a/src/modules/connection/mobile_hotspot.c b/src/modules/connection/mobile_hotspot.c
index 01a72a9..4c03f88 100644
--- a/src/modules/connection/mobile_hotspot.c
+++ b/src/modules/connection/mobile_hotspot.c
@@ -239,21 +239,21 @@ static int _tethering_data_init(tethering_data_t *data)
 	ret = tethering_set_connection_state_changed_cb(data->handle, TETHERING_TYPE_ALL, _tethering_data_connection_state_changed, data);
 	if (ret != TETHERING_ERROR_NONE) {
 		tethering_destroy(data->handle);
-		ERR("tethering_set_connection_state_changed_cb failed: %d", get_error_message(ret));
+		_E("tethering_set_connection_state_changed_cb failed: %d", get_error_message(ret));
 		return FAIL;
 	}
 
 	ret = tethering_set_enabled_cb(data->handle, TETHERING_TYPE_ALL, _tethering_data_enabled_changed, data);
 	if (ret != TETHERING_ERROR_NONE) {
 		tethering_destroy(data->handle);
-		ERR("tethering_set_enabled_cb failed: %d", get_error_message(ret));
+		_E("tethering_set_enabled_cb failed: %d", get_error_message(ret));
 		return FAIL;
 	}
 
 	ret = tethering_set_disabled_cb(data->handle, TETHERING_TYPE_ALL, _tethering_data_disabled, data);
 	if (ret != TETHERING_ERROR_NONE) {
 		tethering_destroy(data->handle);
-		ERR("tethering_set_disabled_cb failed: %d", get_error_message(ret));
+		_E("tethering_set_disabled_cb failed: %d", get_error_message(ret));
 		return FAIL;
 	}
 
diff --git a/src/modules/connection/wifi.c b/src/modules/connection/wifi.c
index bb42401..f6602b2 100644
--- a/src/modules/connection/wifi.c
+++ b/src/modules/connection/wifi.c
@@ -109,7 +109,7 @@ static void show_wifi_transfer_icon(void *data)
 	int status = 0;
 
 	if (vconf_get_int(VCONFKEY_WIFI_TRANSFER_STATE, &status) < 0) {
-		ERR("Error getting VCONFKEY_WIFI_TRANSFER_STATE value");
+		_E("Error getting VCONFKEY_WIFI_TRANSFER_STATE value");
 		return;
 	}
 
@@ -252,28 +252,28 @@ static int register_wifi_module(void *data)
 
 	ret = wifi_set_device_state_changed_cb(_wifi_device_state_changed, data);
 	if (ret != WIFI_ERROR_NONE) {
-		ERR("wifi_set_device_state_changed_cb failed: %s", get_error_message(ret));
+		_E("wifi_set_device_state_changed_cb failed: %s", get_error_message(ret));
 		unregister_wifi_module();
 		return FAIL;
 	}
 
 	ret = util_wifi_set_connection_state_changed_cb(_wifi_connection_state_changed, data);
 	if (ret != 0) {
-		ERR("util_wifi_set_connection_state_changed_cb failed");
+		_E("util_wifi_set_connection_state_changed_cb failed");
 		unregister_wifi_module();
 		return FAIL;
 	}
 
 	ret = wifi_set_rssi_level_changed_cb(_wifi_rssi_level_changed, data);
 	if (ret != WIFI_ERROR_NONE) {
-		ERR("wifi_set_rssi_level_changed_cb failed: %s", get_error_message(ret));
+		_E("wifi_set_rssi_level_changed_cb failed: %s", get_error_message(ret));
 		unregister_wifi_module();
 		return FAIL;
 	}
 
 	ret = vconf_notify_key_changed(VCONFKEY_WIFI_TRANSFER_STATE, _wifi_changed_cb, data);
 	if (ret != WIFI_ERROR_NONE) {
-		ERR("vconf_notify_key_changed failed: %s", get_error_message(ret));
+		_E("vconf_notify_key_changed failed: %s", get_error_message(ret));
 		unregister_wifi_module();
 		return FAIL;
 	}
@@ -292,7 +292,7 @@ static int unregister_wifi_module(void)
 
 	int ret = wifi_deinitialize();
 	if (ret != WIFI_ERROR_NONE) {
-		ERR("wifi_deinitialize failed : %s", get_error_message(ret));
+		_E("wifi_deinitialize failed : %s", get_error_message(ret));
 	}
 
 	return OK;
diff --git a/src/modules/information/alarm.c b/src/modules/information/alarm.c
index 633f5cf..4f35ba7 100644
--- a/src/modules/information/alarm.c
+++ b/src/modules/information/alarm.c
@@ -112,7 +112,7 @@ static void indicator_alarm_change_cb(keynode_t *node, void *data)
 		hide_image_icon();
 		return;
 	}
-	ERR("Failed to get alarm count!");
+	_E("Failed to get alarm count!");
 	return;
 }
 
@@ -150,7 +150,7 @@ static int register_alarm_module(void *data)
 	set_app_state(data);
 	if (ret < 0)
 	{
-		ERR("Fail to init alarmdb.");
+		_E("Fail to init alarmdb.");
 		return FAIL;
 	}
 
diff --git a/src/modules/information/noti.c b/src/modules/information/noti.c
index c48edee..56c8eb5 100644
--- a/src/modules/information/noti.c
+++ b/src/modules/information/noti.c
@@ -145,7 +145,7 @@ char *__indicator_ui_get_pkginfo_icon(const char *pkgid)
 	ret = app_info_get_icon(app_info, &icon_path);
 	if (ret != APP_MANAGER_ERROR_NONE) {
 		app_info_destroy(app_info);
-		ERR("app_info_get_icon failed %d", ret);
+		_E("app_info_get_icon failed %d", ret);
 		return NULL;
 	}
 
diff --git a/src/modules/information/video_play.c b/src/modules/information/video_play.c
index 677cc4c..7d1d5ea 100644
--- a/src/modules/information/video_play.c
+++ b/src/modules/information/video_play.c
@@ -27,6 +27,7 @@
 #include "icon.h"
 #include "modules.h"
 #include "main.h"
+#include "log.h"
 
 #define ICON_PRIORITY	INDICATOR_PRIORITY_NOTI_1
 #define MODULE_NAME		"VIDEO_PLAY"
diff --git a/src/modules/information/voice_recorder.c b/src/modules/information/voice_recorder.c
index dcc7c63..6b2d13c 100644
--- a/src/modules/information/voice_recorder.c
+++ b/src/modules/information/voice_recorder.c
@@ -27,6 +27,7 @@
 #include "icon.h"
 #include "modules.h"
 #include "main.h"
+#include "log.h"
 
 #define ICON_PRIORITY	INDICATOR_PRIORITY_MINICTRL1
 #define MODULE_NAME		"VOICE_RECORDER"
diff --git a/src/modules/power/battery.c b/src/modules/power/battery.c
index 8700964..d092c5b 100644
--- a/src/modules/power/battery.c
+++ b/src/modules/power/battery.c
@@ -603,7 +603,7 @@ static void indicator_battery_update_display(void *data)
 
 	if (battery_percentage < 0)
 	{
-		ERR("Invalid Battery Capacity in percents: %d", battery_percentage);
+		_E("Invalid Battery Capacity in percents: %d", battery_percentage);
 		return;
 	}
 
@@ -640,7 +640,7 @@ static void indicator_battery_check_charging(void *data)
 
 	if (ret != DEVICE_ERROR_NONE)
 	{
-		ERR("Fail to get battery charging status");
+		_E("Fail to get battery charging status");
 		return;
 	} else {
 		_D("Battery charge Status: %d", status);
diff --git a/src/modules/processing/downloading.c b/src/modules/processing/downloading.c
index ced3990..8299cf3 100644
--- a/src/modules/processing/downloading.c
+++ b/src/modules/processing/downloading.c
@@ -26,6 +26,7 @@
 #include "main.h"
 #include "modules.h"
 #include "icon.h"
+#include "log.h"
 
 #define ICON_PRIORITY	INDICATOR_PRIORITY_NOTI_1
 #define MODULE_NAME		"downloading"
@@ -98,7 +99,7 @@ static void show_downloading_icon(void* data)
 	}
 	else
 	{
-		ERR("show_downloading_icon!, timer");
+		_E("show_downloading_icon!, timer");
 	}
 }
 
@@ -132,7 +133,7 @@ static void indicator_downloading_change_cb(keynode_t *node, void *data)
 	{
 		result = result | status;
 	} else {
-		ERR("Error getting VCONFKEY_WIFI_DIRECT_RECEIVING_STATE value");
+		_E("Error getting VCONFKEY_WIFI_DIRECT_RECEIVING_STATE value");
 	}*/
 
 	if (result == 1) {
@@ -151,7 +152,7 @@ static void indicator_downloading_pm_state_change_cb(keynode_t *node, void *data
 
 	if (vconf_get_int(VCONFKEY_PM_STATE, &status) < 0)
 	{
-		ERR("Error getting VCONFKEY_PM_STATE value");
+		_E("Error getting VCONFKEY_PM_STATE value");
 
 		if (timer != NULL)
 		{
diff --git a/src/modules/processing/uploading.c b/src/modules/processing/uploading.c
index 9c07780..f0351a2 100644
--- a/src/modules/processing/uploading.c
+++ b/src/modules/processing/uploading.c
@@ -26,6 +26,7 @@
 #include "main.h"
 #include "modules.h"
 #include "icon.h"
+#include "log.h"
 
 #define ICON_PRIORITY	INDICATOR_PRIORITY_NOTI_1
 #define MODULE_NAME		"uploading"
@@ -98,7 +99,7 @@ static void show_uploading_icon(void* data)
 	}
 	else
 	{
-		ERR("show_uploading_icon!, timer");
+		_E("show_uploading_icon!, timer");
 	}
 }
 
@@ -132,7 +133,7 @@ static void indicator_uploading_change_cb(keynode_t *node, void *data)
 	{
 		result = result | status;
 	} else {
-		ERR("Failed to get VCONFKEY_WIFI_DIRECT_SENDING_STATE value");
+		_E("Failed to get VCONFKEY_WIFI_DIRECT_SENDING_STATE value");
 	}*/
 
 	if (result == 1) {
diff --git a/src/modules/setting/bluetooth.c b/src/modules/setting/bluetooth.c
index 5d6b5ee..8d0770a 100644
--- a/src/modules/setting/bluetooth.c
+++ b/src/modules/setting/bluetooth.c
@@ -240,9 +240,9 @@ static int register_bluetooth_module(void *data)
 
 	// Register bluetooth adapter state call-back.
 	ret = bt_initialize();
-	if(ret != BT_ERROR_NONE) ERR("bt_initialize failed");
+	if(ret != BT_ERROR_NONE) _E("bt_initialize failed");
 	ret = bt_adapter_set_state_changed_cb(indicator_bluetooth_adapter_state_changed_cb, data);
-	if(ret != BT_ERROR_NONE) ERR("bt_adapter_set_state_changed_cb failed");
+	if(ret != BT_ERROR_NONE) _E("bt_adapter_set_state_changed_cb failed");
 
 	ret = bt_device_set_connection_state_changed_cb(indicator_bluetooth_change_cb, data);
 	if (ret != BT_ERROR_NONE)
@@ -263,9 +263,9 @@ static int unregister_bluetooth_module(void)
 
 	// Unregister bluetooth adapter state call-back.
 	ret = bt_adapter_unset_state_changed_cb();
-	if(ret != BT_ERROR_NONE) ERR("bt_adapter_unset_state_changed_cb failed");
+	if(ret != BT_ERROR_NONE) _E("bt_adapter_unset_state_changed_cb failed");
 	ret = bt_deinitialize();
-	if(ret != BT_ERROR_NONE) ERR("bt_deinitialize failed");
+	if(ret != BT_ERROR_NONE) _E("bt_deinitialize failed");
 
 	return ret;
 }
diff --git a/src/modules/setting/gps.c b/src/modules/setting/gps.c
index a44a4bd..6a3adc4 100644
--- a/src/modules/setting/gps.c
+++ b/src/modules/setting/gps.c
@@ -114,7 +114,7 @@ static int indicator_gps_state_get(void)
 
 	if (runtime_info_get_value_int(RUNTIME_INFO_KEY_GPS_STATUS, (int *)&gps_status) < 0)
 	{
-		ERR("Error getting RUNTIME_INFO_KEY_GPS_STATUS value");
+		_E("Error getting RUNTIME_INFO_KEY_GPS_STATUS value");
 		return 0;
 	}
 
@@ -160,7 +160,7 @@ static void _gps_state_icon_set(int status, void *data)
 
 	default:
 		hide_image_icon();
-		ERR("Invalid value!");
+		_E("Invalid value!");
 		break;
 	}
 
diff --git a/src/modules/setting/nfc.c b/src/modules/setting/nfc.c
index cbc9437..ec3c5ef 100644
--- a/src/modules/setting/nfc.c
+++ b/src/modules/setting/nfc.c
@@ -157,7 +157,7 @@ static int unregister_nfc_module(void)
 	nfc_manager_unset_activation_changed_cb();
 
 	if (get_last_result() != NFC_ERROR_NONE)
-		ERR("Failed to unregister callback!");
+		_E("Failed to unregister callback!");
 
 	return OK;
 }
diff --git a/src/modules/setting/silent.c b/src/modules/setting/silent.c
index 56df3f0..ec60c69 100644
--- a/src/modules/setting/silent.c
+++ b/src/modules/setting/silent.c
@@ -211,11 +211,11 @@ static int unregister_silent_module(void)
 
 	ret = system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_SOUND_SILENT_MODE);
 	if (ret != SYSTEM_SETTINGS_ERROR_NONE)
-		ERR("Failed to unset silent mode change callback function.");
+		_E("Failed to unset silent mode change callback function.");
 
 	ret = runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_VIBRATION_ENABLED);
 	if (ret != RUNTIME_INFO_ERROR_NONE)
-		ERR("Failed to unset vibration change callback function.");
+		_E("Failed to unset vibration change callback function.");
 
 	return ret;
 }
diff --git a/src/tts.c b/src/tts.c
index 540bf3f..9407285 100644
--- a/src/tts.c
+++ b/src/tts.c
@@ -134,7 +134,7 @@ static tts_state_e _tts_state_get(void)
 	if (s_info.tts_handler != NULL) {
 		ret = tts_get_state(s_info.tts_handler, &state);
 		if (TTS_ERROR_NONE != ret){
-			ERR("get state error(%d)", ret);
+			_E("get state error(%d)", ret);
 			return -1;
 		}
 
@@ -152,7 +152,7 @@ static void _tts_play(const char *message)
 	int ret = TTS_ERROR_NONE;
 
 	if (s_info.tts_handler == NULL) {
-		ERR("critical, TTS handler isn't initialized");
+		_E("critical, TTS handler isn't initialized");
 		return;
 	}
 
@@ -160,13 +160,13 @@ static void _tts_play(const char *message)
 
 	ret = tts_add_text(s_info.tts_handler, message, NULL, TTS_VOICE_TYPE_AUTO, TTS_SPEED_AUTO, &utt);
 	if (TTS_ERROR_NONE != ret){
-		ERR("add text error!");
+		_E("add text error!");
 		return;
 	}
 
 	ret = tts_play(s_info.tts_handler);
 	if(ret != TTS_ERROR_NONE) {
-		ERR("play error(%d) state(%d)", ret);
+		_E("play error(%d) state(%d)", ret);
 	}
 }
 
@@ -177,13 +177,13 @@ static void _tts_stop(void)
 	int ret = TTS_ERROR_NONE;
 
 	if (s_info.tts_handler == NULL) {
-		ERR("critical, TTS handler isn't initialized");
+		_E("critical, TTS handler isn't initialized");
 		return;
 	}
 
 	ret = tts_stop(s_info.tts_handler);
 	if (TTS_ERROR_NONE != ret){
-		ERR("failed to stop play:%d", ret);
+		_E("failed to stop play:%d", ret);
 		return;
 	}
 }
@@ -235,22 +235,22 @@ static int _tts_callback_set(tts_h tts, void* data)
 	int ret = 0;
 
 	if (TTS_ERROR_NONE != (ret = tts_set_state_changed_cb(tts, _tts_state_changed_cb, tts))){
-		ERR("set interrupted callback error !!:%d", ret);
+		_E("set interrupted callback error !!:%d", ret);
 		ret = -1;
 	}
 
 	if (TTS_ERROR_NONE != (ret = tts_set_utterance_started_cb(tts, _tts_utt_started_cb, data))) {
-		ERR("set utterance started callback error !!:%d", ret);
+		_E("set utterance started callback error !!:%d", ret);
 		ret = -1;
 	}
 
 	if (TTS_ERROR_NONE != (ret = tts_set_utterance_completed_cb(tts, _tts_utt_completed_cb, data))) {
-		ERR("set utterance completed callback error !!:%d", ret);
+		_E("set utterance completed callback error !!:%d", ret);
 		ret = -1;
 	}
 
 	if (TTS_ERROR_NONE != (ret = tts_set_error_cb(tts, _tts_error_cb, data))) {
-		ERR("set error callback error !!:%d", ret);
+		_E("set error callback error !!:%d", ret);
 		ret = -1;
 	}
 
@@ -267,20 +267,20 @@ static void _tts_init()
 	if (s_info.tts_handler == NULL) {
 		ret = tts_create(&tts);
 		if(ret != TTS_ERROR_NONE) {
-			ERR("tts_create() failed");
+			_E("tts_create() failed");
 			return ;
 		}
 
 		ret = tts_set_mode(tts, TTS_MODE_NOTIFICATION);
 		if(ret != TTS_ERROR_NONE) {
-			ERR("tts_create() failed");
+			_E("tts_create() failed");
 			tts_destroy(s_info.tts_handler);
 			s_info.tts_handler = NULL;
 			return ;
 		}
 
 		if(_tts_callback_set(tts, NULL) != 0) {
-			ERR("_tts_callback_set() failed");
+			_E("_tts_callback_set() failed");
 			tts_destroy(s_info.tts_handler);
 			s_info.tts_handler = NULL;
 			return ;
@@ -288,7 +288,7 @@ static void _tts_init()
 
 		ret = tts_prepare(tts);
 		if(ret != TTS_ERROR_NONE) {
-			ERR("tts_create() failed");
+			_E("tts_create() failed");
 			tts_destroy(s_info.tts_handler);
 			s_info.tts_handler = NULL;
 			return ;
@@ -307,7 +307,7 @@ static void _tts_fini(void)
 	if (s_info.tts_handler != NULL) {
 		ret = tts_destroy(s_info.tts_handler);
 		if(ret != TTS_ERROR_NONE) {
-			ERR("tts_destroy() failed");
+			_E("tts_destroy() failed");
 		}
 		s_info.tts_handler = NULL;
 	}
@@ -368,7 +368,7 @@ void indicator_service_tts_play(char *message) {
 		} else if (state == TTS_STATE_READY) {
 			_tts_play(message);
 		} else {
-			ERR("invalid status: %d", state);
+			_E("invalid status: %d", state);
 		}
 	}
 }
diff --git a/src/util.c b/src/util.c
index 3c34e92..bc025a3 100644
--- a/src/util.c
+++ b/src/util.c
@@ -172,7 +172,7 @@ void util_battery_percentage_part_content_set(void* data, const char *part, cons
 
 	if (!ecore_file_exists(path))
 	{
-		ERR("icon file does not exist!!: %s",path);
+		_E("icon file does not exist!!: %s",path);
 		return;
 	}
 	elm_image_file_set(icon, path, NULL);
@@ -226,7 +226,7 @@ void util_launch_search(void* data)
 	ret = app_control_send_launch_request(service, NULL, NULL);
 
 	if(ret != APP_CONTROL_ERROR_NONE) {
-		ERR("Cannot launch app");
+		_E("Cannot launch app");
 	}
 
 	app_control_destroy(service);
@@ -253,7 +253,7 @@ int util_check_system_status(void)
 Evas_Object *util_access_object_register(Evas_Object *object, Evas_Object *layout)
 {
 	if ((object == NULL) || (layout == NULL)) {
-		ERR("Access object doesn't exist!!! %x %x",object,layout);
+		_E("Access object doesn't exist!!! %x %x",object,layout);
 		return NULL;
 	}
 
@@ -265,7 +265,7 @@ Evas_Object *util_access_object_register(Evas_Object *object, Evas_Object *layou
 void util_access_object_unregister(Evas_Object *object)
 {
 	if (object == NULL) {
-		ERR("Access object doesn't exist!!! %x",object);
+		_E("Access object doesn't exist!!! %x",object);
 		return NULL;
 	}
 
@@ -277,7 +277,7 @@ void util_access_object_unregister(Evas_Object *object)
 void util_access_object_info_set(Evas_Object *object, int info_type, char *info_text)
 {
 	if ((object == NULL) || (info_text == NULL)) {
-		ERR("Access info set fails %x, %x!!!",object,info_text);
+		_E("Access info set fails %x, %x!!!",object,info_text);
 		return;
 	}
 
@@ -289,7 +289,7 @@ void util_access_object_info_set(Evas_Object *object, int info_type, char *info_
 void util_access_object_activate_cb_set(Evas_Object *object, Elm_Access_Activate_Cb activate_cb, void *cb_data)
 {
 	if ((object == NULL) || (activate_cb == NULL)) {
-		ERR("Access activated cb set fails %x %x!!!",object,activate_cb);
+		_E("Access activated cb set fails %x %x!!!",object,activate_cb);
 		return;
 	}
 
@@ -301,7 +301,7 @@ void util_access_object_activate_cb_set(Evas_Object *object, Elm_Access_Activate
 void util_access_object_info_cb_set(Evas_Object *object, int type, Elm_Access_Info_Cb info_cb, void *cb_data)
 {
 	if ((object == NULL) || (info_cb == NULL)) {
-		ERR("Access info cb set fails  %x %x!!!",object,info_cb);
+		_E("Access info cb set fails  %x %x!!!",object,info_cb);
 		return;
 	}
 
@@ -315,7 +315,7 @@ void util_icon_access_register(icon_s *icon)
 
 	if(icon == NULL)
 	{
-		ERR("ICON NULL");
+		_E("ICON NULL");
 		return;
 	}
 
@@ -339,7 +339,7 @@ void util_icon_access_unregister(icon_s *icon)
 {
 	if(icon == NULL)
 	{
-		ERR("ICON NULL");
+		_E("ICON NULL");
 		return;
 	}
 
@@ -359,7 +359,7 @@ static char* _get_timezone_from_vconf(void)
 	szTimezone = vconf_get_str(VCONFKEY_SETAPPL_TIMEZONE_ID);
 	if(szTimezone == NULL)
 	{
-		ERR("Cannot get time zone.");
+		_E("Cannot get time zone.");
 		return strdup("N/A");
 	}
 
@@ -380,7 +380,7 @@ char* util_get_timezone_str(void)
 	}
 	else
 	{
-		ERR("NO TIMEZONEINFO");
+		_E("NO TIMEZONEINFO");
 		return _get_timezone_from_vconf();
 	}
 	return (char*)strdup(buf+20);	// Asia/Seoul
@@ -610,13 +610,13 @@ const char *util_get_file_path(enum app_subdir dir, const char *relative)
 		prefix = app_get_external_cache_path();
 		break;
 	default:
-		LOGE("Not handled directory type.");
+		_E("Not handled directory type.");
 		return NULL;
 	}
 	size_t res = eina_file_path_join(buf, sizeof(buf), prefix, relative);
 	free(prefix);
 	if (res > sizeof(buf)) {
-		LOGE("Path exceeded PATH_MAX");
+		_E("Path exceeded PATH_MAX");
 		return NULL;
 	}
 
@@ -692,7 +692,7 @@ int util_system_settings_set_changed_cb(system_settings_key_e key, system_settin
 	system_settings_unset_changed_cb(key);
 	int err = system_settings_set_changed_cb(key, _system_settings_cb, NULL);
 	if (err != SYSTEM_SETTINGS_ERROR_NONE) {
-		ERR("system_settings_set_changed_cb failed: %s", get_error_message(err));
+		_E("system_settings_set_changed_cb failed: %s", get_error_message(err));
 		free(handler);
 		return -1;
 	}
@@ -749,7 +749,7 @@ int util_runtime_info_set_changed_cb(runtime_info_key_e key, runtime_info_change
 	runtime_info_unset_changed_cb(key);
 	int err = runtime_info_set_changed_cb(key, _runtime_info_cb, NULL);
 	if (err != RUNTIME_INFO_ERROR_NONE) {
-		ERR("runtime_info_set_changed_cb failed: %s", get_error_message(err));
+		_E("runtime_info_set_changed_cb failed: %s", get_error_message(err));
 		free(handler);
 		return -1;
 	}