Replace DBG with _D macro.

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

21 files changed, 92 insertions, 90 deletions

diff --git a/src/box.c b/src/box.c
index b61a506..bc69153 100644
--- a/src/box.c
+++ b/src/box.c
@@ -382,7 +382,7 @@ extern int box_pack(icon_s *icon)
 			if (data->priority <= icon->priority) {
 				icon->exist_in_view = EINA_TRUE;
 				_view_system_list = eina_list_append_relative_list(_view_system_list, icon, l);
-				DBG("System (eina_list_append_relative_list) %s",icon->name);
+				_D("System (eina_list_append_relative_list) %s",icon->name);
 				goto __CATCH;
 			}
 		}
@@ -390,7 +390,7 @@ extern int box_pack(icon_s *icon)
 		/* if finding condition is failed, append it at tail */
 		icon->exist_in_view = EINA_TRUE;
 		_view_system_list = eina_list_prepend(_view_system_list, icon);
-		DBG("System prepend (Priority low) : %s",icon->name);
+		_D("System prepend (Priority low) : %s",icon->name);
 	} else if(INDICATOR_ICON_AREA_MINICTRL == icon->area) {
 		INFO("Pack to MINICTRL list : %s", icon->name);
 		icon_s *data;
@@ -522,7 +522,7 @@ int box_unpack(icon_s *icon)
 	if (noti_count > 0) {
 		util_signal_emit(_win->data, "indicator.noti.show", "indicator.prog");
 	} else {
-		DBG("Need to stop blink animation and hide icon");
+		_D("Need to stop blink animation and hide icon");
 		util_signal_emit_by_win(_win->data,"indicator.noti.hide", "indicator.prog");
 	}
 #endif
@@ -682,14 +682,14 @@ int box_get_enabled_noti_count(void)
 
 	int system_cnt = box_get_count(SYSTEM_LIST);
 	int minictrl_cnt = box_get_count(MINICTRL_LIST);
-	DBG("System Count : %d, Minictrl Count : %d", system_cnt, minictrl_cnt);
+	_D("System Count : %d, Minictrl Count : %d", system_cnt, minictrl_cnt);
 
 	enabled_noti_cnt = MAX_NOTI_ICONS_PORT - system_cnt - minictrl_cnt;
 	if(enabled_noti_cnt <= 0) {
 		enabled_noti_cnt = 1;    // Notification icon must show at least 1.
 	}
 
-	DBG("Notification icon enabled_noti_cnt %d",enabled_noti_cnt);
+	_D("Notification icon enabled_noti_cnt %d",enabled_noti_cnt);
 
 	return enabled_noti_cnt;
 }
diff --git a/src/icon.c b/src/icon.c
index 5c9e15a..9d1f63b 100644
--- a/src/icon.c
+++ b/src/icon.c
@@ -625,7 +625,7 @@ unsigned int icon_get_update_flag(void)
 
 void icon_set_update_flag(unsigned int val)
 {
-	DBG("SET UPDATE FLAG %d",val);
+	_D("SET UPDATE FLAG %d",val);
 	update_icon_flag = val;
 }
 
@@ -670,14 +670,14 @@ void icon_reset_list(void)
 	int minictrl_cnt = box_get_count(MINICTRL_LIST);
 
 	if (minictrl_cnt > box_get_minictrl_list()) {
-		DBG("11 minictrl_cnt : %d //  box_get_minictrl_list : %d", minictrl_cnt, box_get_minictrl_list());
+		_D("11 minictrl_cnt : %d //  box_get_minictrl_list : %d", minictrl_cnt, box_get_minictrl_list());
 		while (minictrl_cnt > box_get_minictrl_list()) {
-			DBG("22 minictrl_cnt : %d //  box_get_minictrl_list : %d", minictrl_cnt, box_get_minictrl_list());
+			_D("22 minictrl_cnt : %d //  box_get_minictrl_list : %d", minictrl_cnt, box_get_minictrl_list());
 			icon_s *wish_remove_icon = NULL;
 			wish_remove_icon = list_try_to_find_icon_to_remove(INDICATOR_ICON_AREA_MINICTRL,0);
 
 			if (wish_remove_icon == NULL) {
-				DBG("icon_reset_list NULL!");
+				_D("icon_reset_list NULL!");
 				break;
 			}
 
@@ -750,24 +750,24 @@ static void _show_hide_more_noti(win_info* win, bool show)
 void icon_handle_more_notify_icon(win_info* win)
 {
 	retif(win == NULL, , "Invalid parameter!");
-	DBG("icon_handle_more_notify_icon called !!");
+	_D("icon_handle_more_notify_icon called !!");
 /*	int system_cnt = box_get_count(SYSTEM_LIST);
 	int minictrl_cnt = box_get_count(MINICTRL_LIST);
 	int noti_cnt = list_get_noti_count();
 
-	DBG("System count : %d, Minictrl count : %d, Notification count : %d", system_cnt, minictrl_cnt, noti_cnt);
+	_D("System count : %d, Minictrl count : %d, Notification count : %d", system_cnt, minictrl_cnt, noti_cnt);
 	if(win->type == INDICATOR_WIN_PORT)
 	{
-		DBG("PORT :: %d", (system_cnt + minictrl_cnt + noti_cnt));
+		_D("PORT :: %d", (system_cnt + minictrl_cnt + noti_cnt));
 		if((system_cnt + minictrl_cnt + noti_cnt) > MAX_NOTI_ICONS_PORT)
 		{
 			_show_hide_more_noti(win, true);
-			DBG("PORT :: handle_more_notify_show");
+			_D("PORT :: handle_more_notify_show");
 		}
 		else
 		{*/
 			_show_hide_more_noti(win, false);
-			DBG("PORT :: handle_more_notify_hide");
+			_D("PORT :: handle_more_notify_hide");
 		/*}
 	}*/
 }
diff --git a/src/main.c b/src/main.c
index 497f511..a5084ac 100644
--- a/src/main.c
+++ b/src/main.c
@@ -952,7 +952,7 @@ static void _indicator_mouse_up_cb(void *data, Evas * e, Evas_Object * obj, void
 
 		} else if (box_check_more_icon_area(win, ev->canvas.x, ev->canvas.y)) {
 			if(show_hide_pressed == EINA_TRUE) {
-				DBG("pressed area");
+				_D("pressed area");
 				feedback_play_type(FEEDBACK_TYPE_SOUND, FEEDBACK_PATTERN_TAP);
 			}
 		}
@@ -1001,25 +1001,25 @@ static void _indicator_mouse_up_cb(void *data, Evas * e, Evas_Object * obj, void
 static void _app_terminate_cb(app_context_h app_context, app_context_status_e status, void *data)
 {
 	retif(data == NULL, , "Invalid parameter!");
-	DBG("_app_terminate_cb");
+	_D("_app_terminate_cb");
 	char *app_id = NULL;
 	app_context_get_app_id(app_context, &app_id);
 	if (app_id == NULL) {
 		ERR("app_id is null!!");
 		return;
 	} else {
-		DBG("_app_terminate_cb %s",app_id);
+		_D("_app_terminate_cb %s",app_id);
 	}
 
 	if (status == APP_CONTEXT_STATUS_TERMINATED) {
 		if (strcmp(MP_APP_ID,app_id) == 0) {
-			DBG("hide music icon");
+			_D("hide music icon");
 			hide_mp_icon();
 		} else if(strcmp(FMRADIO_APP_ID,app_id) == 0) {
-			DBG("hide fm radio icon");
+			_D("hide fm radio icon");
 			hide_fm_radio_icon();
 		} else if(strcmp(VR_APP_ID,app_id) == 0) {
-			DBG("hide voice recorder icon");
+			_D("hide voice recorder icon");
 			hide_voice_recorder_icon();
 		}
 	}
diff --git a/src/message.c b/src/message.c
index 71e0ff9..979834c 100644
--- a/src/message.c
+++ b/src/message.c
@@ -27,6 +27,7 @@
 #include "util.h"
 #include "tts.h"
 #include "box.h"
+#include "log.h"
 
 
 #define MSG_TIMEOUT 3
@@ -127,7 +128,7 @@ static void _show_message(void* data)
 	start_temp_ani_timer(data);
 	if(ad->opacity_mode==INDICATOR_OPACITY_TRANSPARENT)
 	{
-		DBG("Transparent");
+		_D("Transparent");
 		util_signal_emit_by_win(win,"message.show.noeffect", "indicator.prog");
 		evas_object_show(win->win);
 	}
@@ -295,7 +296,7 @@ static void __handle_2line(win_info* win,char* origin, char* part1, char* part2)
 			if(width > block_width)
 			{
 				exceed_index = exceed_index -1;
-				DBG("reduce exceed index(%d)",exceed_index,width);
+				_D("reduce exceed index(%d)",exceed_index,width);
 			}
 			else
 			{
@@ -322,7 +323,7 @@ static void __handle_2line(win_info* win,char* origin, char* part1, char* part2)
 			if(width < block_width)
 			{
 				exceed_index = exceed_index +1;
-				DBG("increase exceed index(%d)",exceed_index,width);
+				_D("increase exceed index(%d)",exceed_index,width);
 			}
 			else
 			{
@@ -436,7 +437,7 @@ static void _handle_message_by_win(char *message, void *data)
 		msg_type = 2;
 	}
 
-	DBG("msg_type %d",  msg_type);
+	_D("msg_type %d",  msg_type);
 
 	_show_message(win);
 
@@ -512,7 +513,7 @@ static void _buf_timeout_callback(void* data)
 	if(current_buf_index<QUEUE_SIZE)
 	if(msg_queue[current_buf_index].data!=NULL)
 	{
-		DBG("index %d,%s",current_buf_index,msg_queue[current_buf_index].data);
+		_D("index %d,%s",current_buf_index,msg_queue[current_buf_index].data);
 		__message_callback(msg_queue[current_buf_index].data,data);
 		if(msg_queue[current_buf_index].data!=NULL)
 		{
@@ -542,7 +543,7 @@ static void _buf_timeout_callback(void* data)
 	}
 	current_buf_cnt = 0;
 	current_buf_index = 0;
-	DBG("quit buffering..");
+	_D("quit buffering..");
 }
 
 
@@ -635,7 +636,7 @@ void indicator_message_display_trigger(void)
 		return;
 	}
 
-	DBG("retry message");
+	_D("retry message");
 
 	msg_retry = 1;
 
diff --git a/src/modules/clock/clock.c b/src/modules/clock/clock.c
index b570abc..254e499 100644
--- a/src/modules/clock/clock.c
+++ b/src/modules/clock/clock.c
@@ -326,7 +326,7 @@ static int language_changed_cb(void *data)
 	ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_LANGUAGE, &pa_lang);
 	retv_if(ret != SYSTEM_SETTINGS_ERROR_NONE, FAIL);
 
-	DBG("language_changed_cb %s",pa_lang);
+	_D("language_changed_cb %s",pa_lang);
 	indicator_clock_changed_cb(data);
 
 	free(pa_lang);
@@ -355,7 +355,7 @@ static int wake_up_cb(void *data)
 
 static void time_format_changed(system_settings_key_e key, void *data)
 {
-	DBG("time format changed");
+	_D("time format changed");
 	clock_format_changed(data);
 }
 
@@ -449,7 +449,7 @@ void indicator_get_apm_by_region(char* output,void *data)
 	ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &locale);
 	ret_if(ret != SYSTEM_SETTINGS_ERROR_NONE);
 
-	DBG("Locale: %s", locale);
+	_D("Locale: %s", locale);
 
 	retm_if(locale == NULL, "[Error] get value of fail.");
 
@@ -473,7 +473,7 @@ void indicator_get_apm_by_region(char* output,void *data)
 	i18n_ustring_copy_ua(u_best_pattern, "a");
 
 	char *timezone_id = util_get_timezone_str();
-	DBG("TimeZone is %s", timezone_id);
+	_D("TimeZone is %s", timezone_id);
 
 	if (s_best_pattern[0] == 'a') {
 		apm_position = 0;
@@ -561,7 +561,7 @@ void indicator_get_time_by_region(char* output,void *data)
 
 	ret = system_settings_get_value_string(SYSTEM_SETTINGS_KEY_LOCALE_COUNTRY, &locale);
 	retm_if(ret != SYSTEM_SETTINGS_ERROR_NONE, "Cannot get LOCALE_COUNTRY string");
-	DBG("Locale: %s", locale);
+	_D("Locale: %s", locale);
 
 	if (locale == NULL) {
 		ERR("[Error] get value of fail.");
@@ -595,7 +595,7 @@ void indicator_get_time_by_region(char* output,void *data)
 
 	i18n_ustring_copy_au(s_best_pattern, u_best_pattern);
 
-	DBG("BestPattern is %s", s_best_pattern);
+	_D("BestPattern is %s", s_best_pattern);
 
 	i18n_udate date;
 	ret = i18n_ucalendar_get_now(&date);
@@ -606,7 +606,7 @@ void indicator_get_time_by_region(char* output,void *data)
 	}
 
 	char* timezone_id = util_get_timezone_str();
-	DBG("TimeZone is %s", timezone_id);
+	_D("TimeZone is %s", timezone_id);
 
 	if (timezone_id) {
 		i18n_ustring_copy_ua_n(u_timezone, timezone_id, ARRAY_SIZE(u_timezone));
@@ -632,16 +632,16 @@ void indicator_get_time_by_region(char* output,void *data)
 	i18n_udate_destroy(formatter);
 
 	i18n_ustring_copy_au(s_formatted, u_formatted);
-	DBG("DATE & TIME is %s %s %d %s", locale, s_formatted, i18n_ustring_get_length(u_formatted), s_best_pattern);
+	_D("DATE & TIME is %s %s %d %s", locale, s_formatted, i18n_ustring_get_length(u_formatted), s_best_pattern);
 
 	free(locale);
 
-	DBG("24H :: Before change %s", s_formatted);
+	_D("24H :: Before change %s", s_formatted);
 	s_convert_formatted = _string_replacer(s_formatted, colon, ratio);
-	DBG("24H :: After change %s", s_convert_formatted);
+	_D("24H :: After change %s", s_convert_formatted);
 
 	if (!s_convert_formatted) {
-		DBG("_string_replacer return NULL");
+		_D("_string_replacer return NULL");
 		return;
 	}
 
@@ -780,7 +780,7 @@ static char *_access_info_cb(void *data, Evas_Object *obj)
 
 	snprintf(buf, sizeof(buf), "%s, %s, %s", time_str, buf1, _("IDS_IDLE_BODY_STATUS_BAR_ITEM"));
 
-	DBG("buf: %s", buf);
+	_D("buf: %s", buf);
 	tmp = strdup(buf);
 	if (!tmp) return NULL;
 	return tmp;
diff --git a/src/modules/connection/dock.c b/src/modules/connection/dock.c
index 9771a92..9ef8734 100644
--- a/src/modules/connection/dock.c
+++ b/src/modules/connection/dock.c
@@ -27,6 +27,7 @@
 #include "icon.h"
 #include "modules.h"
 #include "main.h"
+#include "log.h"
 
 #define ICON_PRIORITY	INDICATOR_PRIORITY_NOTI_2
 #define MODULE_NAME		"dock"
@@ -98,7 +99,7 @@ static void indicator_dock_change_cb(keynode_t *node, void *data)
 	ret = vconf_get_int(VCONFKEY_SYSMAN_CRADLE_STATUS, &status);
 	if (ret == OK) {
 		if (status > 0) {
-			DBG("dock Status: %d", status);
+			_D("dock Status: %d", status);
 			show_image_icon();
 		}
 		else
diff --git a/src/modules/connection/wifi.c b/src/modules/connection/wifi.c
index e78a3dd..bb42401 100644
--- a/src/modules/connection/wifi.c
+++ b/src/modules/connection/wifi.c
@@ -131,7 +131,7 @@ static void show_wifi_transfer_icon(void *data)
 	}
 
 	if (transfer_state == type) {
-		DBG("same transfer state");
+		_D("same transfer state");
 		return;
 	}
 
diff --git a/src/modules/information/alarm.c b/src/modules/information/alarm.c
index 286e000..633f5cf 100644
--- a/src/modules/information/alarm.c
+++ b/src/modules/information/alarm.c
@@ -27,6 +27,7 @@
 #include "main.h"
 #include "modules.h"
 #include "icon.h"
+#include "log.h"
 
 #define ICON_PRIORITY	INDICATOR_PRIORITY_SYSTEM_1
 #define MODULE_NAME		"alarm"
@@ -103,11 +104,11 @@ static void indicator_alarm_change_cb(keynode_t *node, void *data)
 	ret = vconf_get_int(VCONFKEY_ALARM_STATE, &status);
 	if (ret == OK) {
 		if (status > 0) {
-			DBG("ALARM COUNT: %d", status);
+			_D("ALARM COUNT: %d", status);
 			show_image_icon(data);
 			return;
 		}
-		DBG("ALARM COUNT: %d", status);
+		_D("ALARM COUNT: %d", status);
 		hide_image_icon();
 		return;
 	}
diff --git a/src/modules/information/earphone.c b/src/modules/information/earphone.c
index 7f8058f..a06287e 100644
--- a/src/modules/information/earphone.c
+++ b/src/modules/information/earphone.c
@@ -102,7 +102,7 @@ void check_jack_port(void *data)
 	retm_if(ret != RUNTIME_INFO_ERROR_NONE, "runtime_info_get_value_bool failed[%s]", get_error_message(ret));
 
 	if (is_jack_connected || is_tv_out_connected) {
-		DBG("Earphone connected");
+		_D("Earphone connected");
 		show_image_icon();
 	}
 	else
diff --git a/src/modules/information/fm_radio.c b/src/modules/information/fm_radio.c
index 8ebccd3..4589fab 100644
--- a/src/modules/information/fm_radio.c
+++ b/src/modules/information/fm_radio.c
@@ -26,6 +26,7 @@
 #include "icon.h"
 #include "modules.h"
 #include "main.h"
+#include "log.h"
 
 #define ICON_PRIORITY	INDICATOR_PRIORITY_MINICTRL2
 #define MODULE_NAME		"FM_Radio"
@@ -80,7 +81,7 @@ static void indicator_fm_radio_change_cb(void *data)
 	int status = 0;
 	int ret = -1;
 
-	DBG("indicator_fm_radio_change_cb called!");
+	_D("indicator_fm_radio_change_cb called!");
 	retif(data == NULL, , "Invalid parameter!");
 
 	if (ret == OK) {
@@ -92,7 +93,7 @@ static void indicator_fm_radio_change_cb(void *data)
 	}
 	else
 	{
-		DBG("Fail to get vconfkey (ret:%d)", ret);
+		_D("Fail to get vconfkey (ret:%d)", ret);
 	}
 	return;
 }
@@ -110,7 +111,7 @@ static int register_fm_radio_module(void *data)
 {
 	int ret = -1;
 
-	DBG("register_fm_radio_module called!");
+	_D("register_fm_radio_module called!");
 	retif(data == NULL, FAIL, "Invalid parameter!");
 
 	set_app_state(data);
@@ -124,7 +125,7 @@ static int register_fm_radio_module(void *data)
 
 static int unregister_fm_radio_module(void)
 {
-	DBG("unregister_fm_radio_module called!");
+	_D("unregister_fm_radio_module called!");
 
 	return OK;
 }
diff --git a/src/modules/information/more_notify.c b/src/modules/information/more_notify.c
index 8fab1d6..a758d14 100644
--- a/src/modules/information/more_notify.c
+++ b/src/modules/information/more_notify.c
@@ -98,7 +98,7 @@ static void _handle_more_notify_icon(win_info* win, bool val)
 
 	if (val) {
 		show_image_icon_by_win(win);
-		DBG("_handle_more_notify_show");
+		_D("_handle_more_notify_show");
 	} else {
 		hide_image_icon_by_win(win);
 		_D("_handle_more_notify_hide");
@@ -113,7 +113,7 @@ static void indicator_more_notify_change_cb(const char *key, void *data)
 
 	retm_if(data == NULL, "Invalid parameter!");
 
-	DBG("indicator_more_notify_change_cb");
+	_D("indicator_more_notify_change_cb");
 	win_info* win = NULL;
 
 	if (strcmp(key, INDICATOR_MORE_NOTI) == 0) {
diff --git a/src/modules/information/video_play.c b/src/modules/information/video_play.c
index 64d04ba..677cc4c 100644
--- a/src/modules/information/video_play.c
+++ b/src/modules/information/video_play.c
@@ -98,7 +98,7 @@ static void show_video_icon(void *data)
 
 	ret = vconf_get_bool(VCONF_VIDEO_PLAY_PLAYSTATUS, &status);
 	if (ret == OK) {
-		DBG("VIDEO PLAY state: %d", status);
+		_D("VIDEO PLAY state: %d", status);
 		if (status == 1)
 			show_image_icon(data);
 		else
diff --git a/src/modules/information/voice_recorder.c b/src/modules/information/voice_recorder.c
index 079fdbf..dcc7c63 100644
--- a/src/modules/information/voice_recorder.c
+++ b/src/modules/information/voice_recorder.c
@@ -122,7 +122,7 @@ static void show_voicerecoder_icon(void *data)
 	}
 	updated_while_lcd_off = 0;
 
-	DBG("VOICE RECORDER state: %d", vr_state);
+	_D("VOICE RECORDER state: %d", vr_state);
 	switch (vr_state) {
 	case VOICE_RECORDER_RECORDING:
 		show_image_icon(data, VOICE_RECORDER_RECORDING);
diff --git a/src/modules/power/battery.c b/src/modules/power/battery.c
index 5366b27..8700964 100644
--- a/src/modules/power/battery.c
+++ b/src/modules/power/battery.c
@@ -455,7 +455,7 @@ static void show_battery_icon(int mode, int level)
 
 static void show_digits()
 {
-	DBG("Show digits: %d", battery_percentage);
+	_D("Show digits: %d", battery_percentage);
 
 	if (battery_percentage < 10) {
 		digit.img_obj.data = percentage_battery_digit_icon_path[battery_percentage];
@@ -486,7 +486,7 @@ static void show_digits()
 
 static void hide_digits()
 {
-	DBG("Hide digits");
+	_D("Hide digits");
 
 	icon_hide(&digit);
 	icon_hide(&digit_additional);
@@ -614,7 +614,7 @@ static void indicator_battery_update_display(void *data)
 
 	_level.current_percentage = battery_percentage;
 
-	DBG("Battery capacity percentage: %d", battery_percentage);
+	_D("Battery capacity percentage: %d", battery_percentage);
 
 	/* Check Battery Level */
 	level = __battery_percentage_to_level(battery_percentage);
@@ -643,7 +643,7 @@ static void indicator_battery_check_charging(void *data)
 		ERR("Fail to get battery charging status");
 		return;
 	} else {
-		DBG("Battery charge Status: %d", status);
+		_D("Battery charge Status: %d", status);
 	}
 
 	battery_charging = (int)status;
diff --git a/src/modules/setting/bluetooth.c b/src/modules/setting/bluetooth.c
index 4124f3c..5d6b5ee 100644
--- a/src/modules/setting/bluetooth.c
+++ b/src/modules/setting/bluetooth.c
@@ -132,9 +132,9 @@ static void show_bluetooth_icon(void *data, int status)
 
 static void indicator_bluetooth_adapter_state_changed_cb(int result, bt_adapter_state_e adapter_state, void *user_data)
 {
-	DBG("BT STATUS: %d", adapter_state);
+	_D("BT STATUS: %d", adapter_state);
 	if (adapter_state != BT_ADAPTER_ENABLED) {    // If adapter_state is NULL. hide_image_icon().
-		DBG("BT is not enabled. So hide BT icon.");
+		_D("BT is not enabled. So hide BT icon.");
 		hide_image_icon();
 	} else
 		show_bluetooth_icon(user_data, NO_DEVICE);
@@ -146,11 +146,11 @@ static bool _connected_cb(bt_profile_e profile, void *user_data)
 
 	if (profile == BT_PROFILE_HSP) {
 		*result = (*result | HEADSET_CONNECTED);
-		DBG("BT_HEADSET_CONNECTED(%x)", result);
+		_D("BT_HEADSET_CONNECTED(%x)", result);
 	}
 	else {
 		*result = (*result | DEVICE_CONNECTED);
-		DBG("BT_DEVICE_CONNECTED(%x)", result);
+		_D("BT_DEVICE_CONNECTED(%x)", result);
 	}
 
 	return true;
@@ -167,7 +167,7 @@ static bool _bt_cb(bt_device_info_s *device_info, void *user_data)
 
 static void indicator_bluetooth_change_cb(bool connected, bt_device_connection_info_s *conn_info, void *data)
 {
-	DBG("indicator_bluetooth_change_cb");
+	_D("indicator_bluetooth_change_cb");
 	int ret = 0;
 	int result = NO_DEVICE;
 	bt_adapter_state_e adapter_state = BT_ADAPTER_DISABLED;
@@ -183,7 +183,7 @@ static void indicator_bluetooth_change_cb(bool connected, bt_device_connection_i
 	ret = bt_adapter_get_state(&adapter_state);
 	retif(ret != BT_ERROR_NONE, , "bt_adapter_get_state failed");
 	if (adapter_state != BT_ADAPTER_ENABLED) {  // If adapter_state is NULL. hide_image_icon().
-		DBG("BT is not enabled. So don't need to update BT icon.");
+		_D("BT is not enabled. So don't need to update BT icon.");
 		return;
 	}
 
diff --git a/src/modules/setting/gps.c b/src/modules/setting/gps.c
index 1953fbc..a44a4bd 100644
--- a/src/modules/setting/gps.c
+++ b/src/modules/setting/gps.c
@@ -130,7 +130,7 @@ static int indicator_gps_state_get(void)
 
 static void _gps_state_icon_set(int status, void *data)
 {
-	DBG("GPS STATUS: %d", status);
+	_D("GPS STATUS: %d", status);
 	int ret;
 	display_state_e display_state = DISPLAY_STATE_NORMAL;
 
diff --git a/src/modules/setting/nfc.c b/src/modules/setting/nfc.c
index 44e3e88..cbc9437 100644
--- a/src/modules/setting/nfc.c
+++ b/src/modules/setting/nfc.c
@@ -76,7 +76,7 @@ static void show_image_icon(void *data, int index)
 		index = NFC_ON;
 
 	if(prevIndex == index) {
-		DBG("same icon");
+		_D("same icon");
 		return;
 	}
 
@@ -99,7 +99,7 @@ static void indicator_nfc_change_cb(bool activated, void *data)
 
 	if(icon_get_update_flag()==0) {
 		updated_while_lcd_off = 1;
-		DBG("need to update %d",updated_while_lcd_off);
+		_D("need to update %d",updated_while_lcd_off);
 		return;
 	}
 	updated_while_lcd_off = 0;
diff --git a/src/modules/setting/silent.c b/src/modules/setting/silent.c
index 06e55ad..56df3f0 100644
--- a/src/modules/setting/silent.c
+++ b/src/modules/setting/silent.c
@@ -92,7 +92,7 @@ static void hide_image_icon(void)
 {
 	if(prevIndex == -1)
 	{
-		DBG("ALREADY HIDE");
+		_D("ALREADY HIDE");
 		return;
 	}
 
@@ -111,7 +111,7 @@ static bool _get_sound_profile(bool *silent_mode, bool *vib_status)
 	ret = runtime_info_get_value_bool(RUNTIME_INFO_KEY_VIBRATION_ENABLED, vib_status);
 	retvm_if(ret != RUNTIME_INFO_ERROR_NONE, false, "Failed to get vibration status.");
 
-	DBG("CURRENT Sound Status: %d, Vibration Status: %d", (int)(*silent_mode), (int)(*vib_status));
+	_D("CURRENT Sound Status: %d, Vibration Status: %d", (int)(*silent_mode), (int)(*vib_status));
 
 	return true;
 }
diff --git a/src/ticker.c b/src/ticker.c
index 4796eff..d4f9985 100644
--- a/src/ticker.c
+++ b/src/ticker.c
@@ -405,7 +405,7 @@ static int _is_phone_number(const char *address)
 
 		return 1;
 	} else {
-		DBG("invalid address length [%d]", addr_len);
+		_D("invalid address length [%d]", addr_len);
 		return 0;
 	}
 }
@@ -1026,9 +1026,9 @@ static void _ticker_noti_detailed_changed_cb(void *data, notification_type_e typ
 		ret = notification_op_get_data(op_list, NOTIFICATION_OP_DATA_NOTI, &noti_from_master);
 		ret_if(ret != NOTIFICATION_ERROR_NONE);
 
-		DBG("op_type:%d", op_type);
-		DBG("op_priv_id:%d", priv_id);
-		DBG("noti:%p", noti_from_master);
+		_D("op_type:%d", op_type);
+		_D("op_priv_id:%d", priv_id);
+		_D("noti:%p", noti_from_master);
 
 		if (op_type != NOTIFICATION_OP_INSERT &&
 				op_type != NOTIFICATION_OP_UPDATE) {
@@ -1045,7 +1045,7 @@ static void _ticker_noti_detailed_changed_cb(void *data, notification_type_e typ
 #ifdef QP_EMERGENCY_MODE_ENABLE
 		if (quickpanel_emergency_mode_is_on()) {
 			if (quickpanel_emergency_mode_notification_filter(noti, 1)) {
-				DBG("notification filtered");
+				_D("notification filtered");
 				notification_free(noti);
 				return;
 			}
@@ -1058,7 +1058,7 @@ static void _ticker_noti_detailed_changed_cb(void *data, notification_type_e typ
 	notification_get_display_applist(noti, &applist);
 	if (!((applist & NOTIFICATION_DISPLAY_APP_TICKER)
 				|| (applist & NOTIFICATION_DISPLAY_APP_INDICATOR))) {
-		DBG("displaying ticker option is off");
+		_D("displaying ticker option is off");
 		notification_free(noti);
 		return;
 	}
@@ -1066,7 +1066,7 @@ static void _ticker_noti_detailed_changed_cb(void *data, notification_type_e typ
 	/* Check setting's event notification */
 	ret = _ticker_check_ticker_off(noti);
 	if (ret == 1) {
-		DBG("Disabled tickernoti ret : %d", ret);
+		_D("Disabled tickernoti ret : %d", ret);
 		/* delete temporary here only ticker noti display item */
 		__ticker_only_noti_del(noti);
 		notification_free(noti);
@@ -1077,7 +1077,7 @@ static void _ticker_noti_detailed_changed_cb(void *data, notification_type_e typ
 	/* Skip if previous ticker is still shown */
 /*
 	if (ticker_info->win != NULL) {
-		DBG("delete ticker noti");
+		_D("delete ticker noti");
 		_destroy_tickernoti();
 		ticker_info->win = NULL;
 	}
@@ -1087,7 +1087,7 @@ static void _ticker_noti_detailed_changed_cb(void *data, notification_type_e typ
 	notification_get_property(noti, &flags);
 
 	if (flags & NOTIFICATION_PROP_DISABLE_TICKERNOTI) {
-		DBG("NOTIFICATION_PROP_DISABLE_TICKERNOTI");
+		_D("NOTIFICATION_PROP_DISABLE_TICKERNOTI");
 		__ticker_only_noti_del(noti);
 		notification_free(noti);
 	} else if ((applist & NOTIFICATION_DISPLAY_APP_TICKER)
diff --git a/src/tts.c b/src/tts.c
index 9f9ec23..540bf3f 100644
--- a/src/tts.c
+++ b/src/tts.c
@@ -27,6 +27,7 @@
 #include "main.h"
 #include "common.h"
 #include "tts.h"
+#include "log.h"
 
 static void _tts_init(void);
 static void _tts_fini(void);
@@ -155,7 +156,7 @@ static void _tts_play(const char *message)
 		return;
 	}
 
-	DBG("adding %s", message);
+	_D("adding %s", message);
 
 	ret = tts_add_text(s_info.tts_handler, message, NULL, TTS_VOICE_TYPE_AUTO, TTS_SPEED_AUTO, &utt);
 	if (TTS_ERROR_NONE != ret){
@@ -193,7 +194,7 @@ static void _tts_state_changed_cb(tts_h tts, tts_state_e previous, tts_state_e c
 {
 	QP_TTS_T *entry = NULL;
 
-	DBG("_tts_state_changed_cb(%d => %d)", previous, current);
+	_D("_tts_state_changed_cb(%d => %d)", previous, current);
 
 	if(previous == TTS_STATE_CREATED && current == TTS_STATE_READY) {
 		entry = _tts_list_get_first();
@@ -210,21 +211,21 @@ static void _tts_state_changed_cb(tts_h tts, tts_state_e previous, tts_state_e c
 
 static void _tts_utt_started_cb(tts_h tts, int utt_id, void *user_data)
 {
-	DBG("_tts_utt_started_cb");
+	_D("_tts_utt_started_cb");
 }
 
 
 
 static void _tts_utt_completed_cb(tts_h tts, int utt_id, void *user_data)
 {
-	DBG("_tts_utt_completed_cb");
+	_D("_tts_utt_completed_cb");
 }
 
 
 
 static void _tts_error_cb(tts_h tts, int utt_id, tts_error_e reason, void* user_data)
 {
-	DBG("_tts_error_cb");
+	_D("_tts_error_cb");
 }
 
 
@@ -316,7 +317,7 @@ static void _tts_fini(void)
 
 static void _tts_vconf_cb(keynode_t *key, void *data){
 	if(_is_screenreader_on() == 0) {
-		DBG("TTS turned off");
+		_D("TTS turned off");
 		_tts_fini();
 	}
 
diff --git a/src/util.c b/src/util.c
index cec7277..3c34e92 100644
--- a/src/util.c
+++ b/src/util.c
@@ -74,7 +74,7 @@ char *util_set_label_text_color(const char *txt)
 				LABEL_STRING, FONT_COLOR, txt);
 
 	if (buf_result == EINA_FALSE)
-		DBG("Failed to make label string!");
+		_D("Failed to make label string!");
 	else
 		ret_str = eina_strbuf_string_steal(temp_buf);
 
@@ -98,9 +98,6 @@ void util_signal_emit(void* data, const char *emission, const char *source)
 
 	ad = (struct appdata *)data;
 
-	char *filter1 = "indicator.connection.updown";
-	char *filter2 = "indicator.wifi.updown";
-
 	edje = elm_layout_edje_get(ad->win.layout);
 	ret_if(!edje);
 	edje_object_signal_emit(edje, emission, source);
@@ -196,7 +193,7 @@ void util_send_status_message_start(void* data,double duration)
 	msg.xwin = ad->active_indi_win;
 	msg.duration = duration;
 
-	DBG("status start %x, %f",ad->active_indi_win,duration);
+	_D("status start %x, %f",ad->active_indi_win,duration);
 	ee_port = ecore_evas_ecore_evas_get(evas_object_evas_get(win->win));
 	ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_ANI_START, &(msg), sizeof(Indicator_Data_Animation));
 
@@ -218,7 +215,7 @@ void util_launch_search(void* data)
 	}
 
 	if (util_check_system_status() == FAIL) {
-		DBG("util_check_system_status failed");
+		_D("util_check_system_status failed");
 		return;
 	}
 
@@ -484,7 +481,7 @@ void util_start_noti_ani(void* data)
 
 	if(util_check_noti_ani(icon->img_obj.data))
 	{
-		DBG("%s",icon->name);
+		_D("%s",icon->name);
 		if(!strcmp(icon->img_obj.data,"reserved://indicator/ani/downloading"))
 		{
 			icon_ani_set(icon,ICON_ANI_DOWNLOADING);
@@ -507,7 +504,7 @@ void util_stop_noti_ani(void* data)
 	{
 		Evas_Object *img_edje;
 		img_edje = elm_layout_edje_get(icon->img_obj.obj);
-		DBG("%s",icon->name);
+		_D("%s",icon->name);
 		if(!strcmp(icon->img_obj.data,"reserved://indicator/ani/downloading"))
 		{
 			edje_object_signal_emit(img_edje, "indicator.ani.downloading.stop","elm.swallow.icon");