sync with private

23 files changed, 132 insertions, 476 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ba41f0..998309a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,6 @@ pkg_check_modules(pkgs REQUIRED
 	evas
 	eina
 	fontconfig
-	heynoti
 	libprivilege-control
 	notification
 	vconf
diff --git a/daemon/indicator_box_util.c b/daemon/indicator_box_util.c
index d928f4d..a859207 100755
--- a/daemon/indicator_box_util.c
+++ b/daemon/indicator_box_util.c
@@ -771,7 +771,6 @@ static void indicator_util_icon_state(int win_type, int bShow)
 void indicator_util_show_hide_icons(void* data,int bShow, int bEffect)
 {
 	win_info *win = (win_info *)data;
-	Ecore_Evas *ee_port;
 	retif(data == NULL, , "Invalid parameter!");
 
 	if(bShow)
@@ -783,34 +782,22 @@ void indicator_util_show_hide_icons(void* data,int bShow, int bEffect)
 		indicator_util_icon_state(win->type,0);
 	}
 
-
-	ee_port = ecore_evas_ecore_evas_get(evas_object_evas_get(win->win_main));
-
 	if(win->type == INDICATOR_WIN_LAND)
 	{
 		DBG("land = %d",bShow);
 		if(bShow==FALSE)
 		{
-			int mode = 2;
-			int bRepeat = 1;
-			ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_REPEAT_EVENT, &bRepeat, sizeof(int));
-			ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_TYPE, &mode, sizeof(int));
+			indicator_send_evas_ecore_message(win,1,2);
 		}
 		else
 		{
-			int mode = 1;
-			int bRepeat = 0;
-			ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_REPEAT_EVENT, &bRepeat, sizeof(int));
-			ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_TYPE, &mode, sizeof(int));
+			indicator_send_evas_ecore_message(win,0,1);
 		}
 	}
 	else
 	{
 		DBG("port = %d",bShow);
-		int mode = 1;
-		int bRepeat = 0;
-		ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_REPEAT_EVENT, &bRepeat, sizeof(int));
-		ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_TYPE, &mode, sizeof(int));
+		indicator_send_evas_ecore_message(win,0,1);
 	}
 
 	if(bEffect)
diff --git a/daemon/indicator_ui.c b/daemon/indicator_ui.c
index 489e9df..76ff807 100755
--- a/daemon/indicator_ui.c
+++ b/daemon/indicator_ui.c
@@ -18,7 +18,6 @@
 #include <app.h>
 #include <Ecore_X.h>
 #include <vconf.h>
-#include <heynoti.h>
 #include <unistd.h>
 #include <privilege-control.h>
 #include <app_manager.h>
@@ -40,9 +39,6 @@
 
 #define VCONF_PHONE_STATUS "memory/startapps/sequence"
 
-#define HIBERNATION_ENTER_NOTI	"HIBERNATION_ENTER"
-#define HIBERNATION_LEAVE_NOTI	"HIBERNATION_LEAVE"
-
 #define UNLOCK_ENABLED	0
 #define TIMEOUT			5
 
@@ -90,8 +86,6 @@ static void _indicator_check_battery_percent_on_cb(keynode_t *node, void *data);
 static void _indicator_low_bat_cb(void *data);
 static void _indicator_lang_changed_cb(void *data);
 static void _indicator_region_changed_cb(void *data);
-static void _indicator_hibernation_enter_cb(void *data);
-static void _indicator_hibernation_leave_cb(void *data);
 static void _indicator_window_delete_cb(void *data, Evas_Object * obj,
 					void *event);
 static Eina_Bool _indicator_client_message_cb(void *data, int type,
@@ -299,16 +293,6 @@ static void _indicator_region_changed_cb(void *data)
 	indicator_region_changed_modules(data);
 }
 
-static void _indicator_hibernation_enter_cb(void *data)
-{
-	indicator_hib_enter_modules(data);
-}
-
-static void _indicator_hibernation_leave_cb(void *data)
-{
-	indicator_hib_leave_modules(data);
-}
-
 static void _indicator_window_delete_cb(void *data, Evas_Object * obj,
 					void *event)
 {
@@ -374,7 +358,7 @@ static void _indicator_notify_apptray_state_cb(keynode_t * node, void *data)
 	{
 		case 0:
 			is_apptray_opened = 0;
-			indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),0,0);
+			indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),0,1);
 			if (hide_timer != NULL) {
 				ecore_timer_del(hide_timer);
 				hide_timer = NULL;
@@ -394,6 +378,37 @@ static void _indicator_notify_apptray_state_cb(keynode_t * node, void *data)
 
 }
 
+static void _indicator_power_off_status_cb(keynode_t * node, void *data)
+{
+
+	struct appdata *ad = (struct appdata *)data;
+	int val = -1;
+
+	if (data == NULL) {
+		ERR("data is NULL");
+		return;
+	}
+
+	if (vconf_get_int(VCONFKEY_SYSMAN_POWER_OFF_STATUS, &val) < 0) {
+		ERR("Cannot get VCONFKEY_SYSMAN_POWER_OFF_STATUS");
+		return;
+	}
+
+	DBG("_indicator_power_off_status_cb!!(%d)",val);
+
+	switch(val)
+	{
+		case VCONFKEY_SYSMAN_POWER_OFF_DIRECT:
+		case VCONFKEY_SYSMAN_POWER_OFF_RESTART:
+			DBG("_indicator_power_off_status_cb : Terminated...");
+			app_efl_exit();
+			break;
+		default:
+			break;
+	}
+
+}
+
 static void _rotate_window(void *data, int new_angle)
 {
 	retif(data == NULL, , "Invalid parameter!");
@@ -409,13 +424,13 @@ static void _rotate_window(void *data, int new_angle)
 		case 0:
 		case 180:
 			{
-				int mode = 1;
-				int bRepeat = 0;
-				Ecore_Evas *ee_port;
-				ee_port = ecore_evas_ecore_evas_get(evas_object_evas_get(ad->win[INDICATOR_WIN_PORT].win_main));
-				ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_REPEAT_EVENT, &bRepeat, sizeof(int));
-				ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_TYPE, &mode, sizeof(int));
-
+				if (hide_timer != NULL)
+				{
+					ecore_timer_del(hide_timer);
+					hide_timer = NULL;
+				}
+				indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),0,0);
+				indicator_send_evas_ecore_message(&(ad->win[INDICATOR_WIN_LAND]),0,1);
 			}
 			break;
 		case 90:
@@ -424,11 +439,16 @@ static void _rotate_window(void *data, int new_angle)
 			{
 				DBG("hide indicator = %d %d",is_quickpanel_opened,is_apptray_opened);
 				indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),0,0);
-				if (hide_timer != NULL) {
+				if (hide_timer != NULL)
+				{
 					ecore_timer_del(hide_timer);
 					hide_timer = NULL;
 				}
 			}
+			else
+			{
+				indicator_util_show_hide_icons(&(ad->win[INDICATOR_WIN_LAND]),1,0);
+			}
 			break;
 		default:
 			break;
@@ -579,6 +599,7 @@ static void _mctrl_monitor_cb(minicontrol_action_e action,
 
 	indicator_minictrl_control_modules(action,name,data);
 }
+
 static void
 _indicator_ecore_evas_msg_parent_handle(Ecore_Evas *ee, int msg_domain, int msg_id, void *data, int size)
 {
@@ -695,12 +716,6 @@ static void register_event_handler(void *data)
 	retif(hdl == NULL, , "Failed to register ecore_event_handler!");
 	ad->evt_handlers = eina_list_append(ad->evt_handlers, hdl);
 
-	ad->notifd = heynoti_init();
-	if (ad->notifd == -1) {
-		ERR("noti init is failed");
-		return;
-	}
-
 	ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL,
 		       _indicator_check_battery_percent_on_cb, (void *)ad);
 
@@ -722,16 +737,14 @@ static void register_event_handler(void *data)
 		return;
 	}
 
-	heynoti_subscribe(ad->notifd, HIBERNATION_ENTER_NOTI,
-			  _indicator_hibernation_enter_cb, (void *)ad);
-	heynoti_subscribe(ad->notifd, HIBERNATION_LEAVE_NOTI,
-			  _indicator_hibernation_leave_cb, (void *)ad);
+	ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_POWER_OFF_STATUS,
+		       _indicator_power_off_status_cb, (void *)ad);
 
-	ret = heynoti_attach_handler(ad->notifd);
 	if (ret == -1) {
-		ERR("noti start is failed\n");
+		ERR("VCONFKEY_SYSMAN_POWER_OFF_STATUS is failed\n");
 		return;
 	}
+
 	ret = minicontrol_monitor_start(_mctrl_monitor_cb, data);
 	if (ret != MINICONTROL_ERROR_NONE) {
 		ERR("fail to minicontrol_monitor_start()- %d", ret);
@@ -783,13 +796,8 @@ static int unregister_event_handler(void *data)
 	vconf_ignore_key_changed(VCONFKEY_APPTRAY_STATE,
 				_indicator_notify_apptray_state_cb);
 
-	heynoti_unsubscribe(ad->notifd, HIBERNATION_ENTER_NOTI,
-			    _indicator_hibernation_enter_cb);
-	heynoti_unsubscribe(ad->notifd, HIBERNATION_LEAVE_NOTI,
-			    _indicator_hibernation_leave_cb);
-
-	heynoti_close(ad->notifd);
-	ad->notifd = 0;
+	vconf_ignore_key_changed(VCONFKEY_SYSMAN_POWER_OFF_STATUS,
+				_indicator_power_off_status_cb);
 
 	Ecore_Event_Handler *hdl = NULL;
 	EINA_LIST_FREE(ad->evt_handlers, hdl) {
@@ -1425,7 +1433,7 @@ static void _indicator_mouse_up_cb(void *data, Evas * e, Evas_Object * obj,
 		}
 
 	}
-__CATCH:
+
 	_indicator_home_icon_action(data, 0);
 	home_button_pressed = EINA_FALSE;
 	show_hide_pressed[win->type] = EINA_FALSE;
@@ -1537,11 +1545,6 @@ static void _signal_handler(int signum, siginfo_t *info, void *unused)
     DBG("_signal_handler : Terminated...");
     app_efl_exit();
 }
-static void _heynoti_event_power_off(void *data)
-{
-    DBG("_heynoti_event_power_off : Terminated...");
-    app_efl_exit();
-}
 
 static bool app_create(void *data)
 {
@@ -1639,28 +1642,13 @@ int main(int argc, char *argv[])
 
 	app_event_callback_s event_callback;
 
-	int heyfd = heynoti_init();
-	if (heyfd < 0) {
-		ERR("Failed to heynoti_init[%d]", heyfd);
-	}
-
-	int ret = heynoti_subscribe(heyfd, "power_off_start", _heynoti_event_power_off, NULL);
-	if (ret < 0) {
-		ERR("Failed to heynoti_subscribe[%d]", ret);
-	}
+	int ret = 0;
 
-	if(heyfd >= 0)
-	{
-		ret = heynoti_attach_handler(heyfd);
-		if (ret < 0) {
-			ERR("Failed to heynoti_attach_handler[%d]", ret);
-		}
-	}
+	DBG("Start indicator");
 
 	ret = control_privilege();
 	if (ret != 0) {
-		fprintf(stderr, "[INDICATOR] Failed to control privilege!");
-		return false;
+		ERR("[INDICATOR] Failed to control privilege!");
 	}
 
 	event_callback.create = app_create;
diff --git a/daemon/indicator_ui.h b/daemon/indicator_ui.h
index 5f9d48d..1110f83 100755
--- a/daemon/indicator_ui.h
+++ b/daemon/indicator_ui.h
@@ -88,7 +88,6 @@ struct appdata {
 	Eina_Bool menu;
 	Eina_Bool quickpanel;
 
-	int notifd;
 	Eina_List *evt_handlers;
 
 	enum indicator_opacity_mode opacity_mode;
diff --git a/daemon/indicator_util.c b/daemon/indicator_util.c
index c14ac30..c0e5098 100755
--- a/daemon/indicator_util.c
+++ b/daemon/indicator_util.c
@@ -134,3 +134,15 @@ void indicator_part_text_emit_by_win(void* data, const char *part, const char *t
 	edje_object_part_text_set(edje, part, text);
 }
 
+void indicator_send_evas_ecore_message(void* data, int bRepeat, int bType)
+{
+	Ecore_Evas *ee_port;
+	win_info* win = (win_info*)data;
+	retif(data == NULL, , "Invalid parameter!");
+
+	DBG("win(%d),bRepeat(%d),bType(%d)");
+	ee_port = ecore_evas_ecore_evas_get(evas_object_evas_get(win->win_main));
+	ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_REPEAT_EVENT, &bRepeat, sizeof(int));
+	ecore_evas_msg_send(ee_port, MSG_DOMAIN_CONTROL_INDICATOR, MSG_ID_INDICATOR_TYPE, &bType, sizeof(int));
+
+}
diff --git a/daemon/indicator_util.h b/daemon/indicator_util.h
index 15f742e..19801d5 100755
--- a/daemon/indicator_util.h
+++ b/daemon/indicator_util.h
@@ -23,5 +23,6 @@ void indicator_signal_emit(void* data, const char *emission, const char *source)
 void indicator_part_text_emit(void* data, const char *part, const char *text);
 void indicator_signal_emit_by_win(void* data, const char *emission, const char *source);
 void indicator_part_text_emit_by_win(void* data, const char *part, const char *text);
+void indicator_send_evas_ecore_message(void* data, int bRepeat, int bType);
 
 #endif
diff --git a/data/indicator.xml.in b/data/indicator.xml.in
index 394f04c..86aca75 100755
--- a/data/indicator.xml.in
+++ b/data/indicator.xml.in
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" package="@PKGNAME@" version="0.1.69-1" install-location="internal-only">
+<manifest xmlns="http://tizen.org/ns/packages" package="@PKGNAME@" version="0.1.71-1" install-location="internal-only">
 	<label>@PROJECT_NAME@</label>
 	<author email="yjoo93.park@samsung.com" href="www.samsung.com">Youngjoo Park</author>
 	<author email="seungtaek.chung@samsung.com" href="www.samsung.com">seungtaek chung</author>
diff --git a/data/resource/icons/Connection/B03_connection02.png b/data/resource/icons/Connection/B03_connection02.png
new file mode 100755
index 0000000..10b873f
--- /dev/null
+++ b/data/resource/icons/Connection/B03_connection02.png
diff --git a/modules/clock/clock.c b/modules/clock/clock.c
index 7171edf..5df5a39 100755
--- a/modules/clock/clock.c
+++ b/modules/clock/clock.c
@@ -17,7 +17,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <vconf.h>
-#include <heynoti.h>
 #include <runtime_info.h>
 #include <Ecore_X.h>
 #include <unicode/udat.h>
@@ -67,8 +66,6 @@ static int battery_charging_first = 0;
 
 static int register_clock_module(void *data);
 static int unregister_clock_module(void);
-static int hib_enter_clock_module(void);
-static int hib_leave_clock_module(void *data);
 static int language_changed_cb(void *data);
 static int region_changed_cb(void *data);
 static int wake_up_cb(void *data);
@@ -93,8 +90,6 @@ Indicator_Icon_Object sysclock[INDICATOR_WIN_MAX] = {
 	.exist_in_view = EINA_FALSE,
 	.init = register_clock_module,
 	.fini = unregister_clock_module,
-	.hib_enter = hib_enter_clock_module,
-	.hib_leave = hib_leave_clock_module,
 	.lang_changed = NULL,
 	.region_changed = region_changed_cb,
 	.lang_changed = language_changed_cb,
@@ -112,8 +107,6 @@ Indicator_Icon_Object sysclock[INDICATOR_WIN_MAX] = {
 	.exist_in_view = EINA_FALSE,
 	.init = register_clock_module,
 	.fini = unregister_clock_module,
-	.hib_enter = hib_enter_clock_module,
-	.hib_leave = hib_leave_clock_module,
 	.lang_changed = NULL,
 	.region_changed = region_changed_cb,
 	.lang_changed = language_changed_cb,
@@ -419,6 +412,32 @@ static void indicator_clock_lock_state_cb(keynode_t *node, void *data)
 	}
 
 }
+static void indicator_clock_battery_precentage_setting_cb(keynode_t *node, void *data)
+{
+	int ret = 0;
+	int status = 0;
+
+	retif(data == NULL, , "Invalid parameter!");
+
+	ret = vconf_get_bool(VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL, &status);
+	if (ret != OK)
+	{
+		ERR("Fail to get [%s: %d]",VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL, ret);
+		return;
+	}
+	if(status==0)
+	{
+		if (battery_charging_timer != NULL) {
+			ecore_timer_del(battery_charging_timer);
+			battery_charging_timer = NULL;
+		}
+		if (battery_timer != NULL) {
+			ecore_timer_del(battery_timer);
+			battery_timer = NULL;
+		}
+		indicator_clock_changed_cb(data);
+	}
+}
 
 static void indicator_clock_display_battery_percentage(void *data,int win_type )
 {
@@ -532,27 +551,6 @@ static int register_clock_module(void *data)
 
 	set_app_state(data);
 
-	notifd = heynoti_init();
-
-	if (notifd < 0) {
-		ERR("heynoti_init is failed");
-		return r;
-	}
-
-	ret =
-	    heynoti_subscribe(notifd, SYSTEM_RESUME, indicator_clock_changed_cb,
-			      data);
-	if (ret != OK) {
-		ERR("Fail: register SYSTEM_RESUME");
-		r = r | ret;
-	}
-
-	ret = heynoti_attach_handler(notifd);
-	if (ret != OK) {
-		ERR("Failed to attach heynoti handler!");
-		r = r | ret;
-	}
-
 	ret = vconf_notify_key_changed(VCONFKEY_SYSTEM_TIME_CHANGED,
 				       indicator_clock_format_changed_cb, data);
 	if (ret != OK) {
@@ -617,6 +615,12 @@ static int register_clock_module(void *data)
 		r = r | ret;
 	}
 
+	ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL,
+					indicator_clock_battery_precentage_setting_cb, data);
+	if (ret != OK) {
+		ERR("Failed to register callback!");
+		r = r | ret;
+	}
 
 	indicator_clock_format_changed_cb(NULL, data);
 
@@ -627,11 +631,6 @@ static int unregister_clock_module(void)
 {
 	int ret;
 
-	heynoti_unsubscribe(notifd, SYSTEM_RESUME, indicator_clock_changed_cb);
-
-	heynoti_close(notifd);
-	notifd = 0;
-
 	ret = vconf_ignore_key_changed(VCONFKEY_SYSTEM_TIME_CHANGED,
 					       indicator_clock_format_changed_cb);
 	if (ret != OK)
@@ -678,41 +677,26 @@ static int unregister_clock_module(void)
 	if (ret != OK)
 		ERR("Fail: unregister VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW");
 
-	if (timer != NULL) {
-		ecore_timer_del(timer);
-		timer = NULL;
-	}
-	return OK;
-}
-
-static int hib_enter_clock_module(void)
-{
-	int ret;
-
-	ret = vconf_ignore_key_changed(VCONFKEY_REGIONFORMAT_TIME1224,
-				       indicator_clock_format_changed_cb);
+	ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_BATTERY_PERCENTAGE_BOOL,
+					       indicator_clock_battery_precentage_setting_cb);
 	if (ret != OK)
-		ERR("Fail: unregister VCONFKEY_REGIONFORMAT_TIME1224");
+		ERR("Fail: unregister VCONFKEY_SYSMAN_BATTERY_CHARGE_NOW");
 
 	if (timer != NULL) {
 		ecore_timer_del(timer);
 		timer = NULL;
 	}
 
-	return OK;
-}
-
-static int hib_leave_clock_module(void *data)
-{
-	int ret;
-
-	retif(data == NULL, FAIL, "Invalid parameter!");
+	if (battery_timer != NULL) {
+		ecore_timer_del(battery_timer);
+		battery_timer = NULL;
+	}
 
-	ret = vconf_notify_key_changed(VCONFKEY_REGIONFORMAT_TIME1224,
-				       indicator_clock_format_changed_cb, data);
-	retif(ret != OK, FAIL, "Failed to register callback!");
+	if (battery_charging_timer != NULL) {
+		ecore_timer_del(battery_charging_timer);
+		battery_charging_timer = NULL;
+	}
 
-	indicator_clock_format_changed_cb(NULL, data);
 	return OK;
 }
 
diff --git a/modules/connection/connection.c b/modules/connection/connection.c
index a7ff3a5..fe1c9df 100755
--- a/modules/connection/connection.c
+++ b/modules/connection/connection.c
@@ -162,22 +162,20 @@ static void indicator_conn_change_cb(keynode_t *node, void *data)
 	ret = vconf_get_int(VCONFKEY_DNET_STATE, &status);
 	if (ret == OK) {
 		INFO("CONNECTION DNET Status: %d", status);
-		if (status == VCONFKEY_DNET_TRANSFER) {
-			if (dnet_transferring == EINA_FALSE) {
-				dnet_transferring = EINA_TRUE;
-			}
-		} else {
-			if (dnet_transferring == EINA_TRUE) {
-				dnet_transferring = EINA_FALSE;
-			}
+		if (status == VCONFKEY_DNET_OFF)
+		{
+			hide_image_icon();
+			return;
 		}
 	}
 
 	ret = vconf_get_int(VCONFKEY_TELEPHONY_PSTYPE, &ps_type);
-	if (ret == OK) {
+	if (ret == OK)
+	{
 		INFO("Telephony packet service type: %d", ps_type);
 
-		switch (ps_type) {
+		switch (ps_type)
+		{
 		case VCONFKEY_TELEPHONY_PSTYPE_HSDPA:
 		case VCONFKEY_TELEPHONY_PSTYPE_HSUPA:
 		case VCONFKEY_TELEPHONY_PSTYPE_HSPA:
@@ -204,9 +202,6 @@ static void indicator_conn_change_cb(keynode_t *node, void *data)
 		case VCONFKEY_TELEPHONY_SVCTYPE_3G:
 			show_image_icon(LEVEL_3G);
 			break;
-		case VCONFKEY_TELEPHONY_SVCTYPE_HSDPA:
-			show_image_icon(LEVEL_HS);
-			break;
 		case VCONFKEY_TELEPHONY_SVCTYPE_LTE:
 			show_image_icon(LEVEL_LTE);
 			break;
diff --git a/modules/information/alarm.c b/modules/information/alarm.c
index cdff44b..a41cce8 100755
--- a/modules/information/alarm.c
+++ b/modules/information/alarm.c
@@ -29,8 +29,6 @@
 
 static int register_alarm_module(void *data);
 static int unregister_alarm_module(void);
-static int hib_enter_alarm_module(void);
-static int hib_leave_alarm_module(void *data);
 
 Indicator_Icon_Object useralarm[INDICATOR_WIN_MAX] = {
 {
@@ -46,8 +44,6 @@ Indicator_Icon_Object useralarm[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_SYSTEM,
 	.init = register_alarm_module,
 	.fini = unregister_alarm_module,
-	.hib_enter = hib_enter_alarm_module,
-	.hib_leave = hib_leave_alarm_module
 },
 {
 	.win_type = INDICATOR_WIN_LAND,
@@ -62,8 +58,6 @@ Indicator_Icon_Object useralarm[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_SYSTEM,
 	.init = register_alarm_module,
 	.fini = unregister_alarm_module,
-	.hib_enter = hib_enter_alarm_module,
-	.hib_leave = hib_leave_alarm_module
 }
 
 };
@@ -154,29 +148,3 @@ static int unregister_alarm_module(void)
 
 	return OK;
 }
-
-static int hib_enter_alarm_module(void)
-{
-	int ret;
-
-	ret = vconf_ignore_key_changed(VCONFKEY_ALARM_STATE,
-				       indicator_alarm_change_cb);
-	if (ret != OK)
-		ERR("Failed to unregister callback!");
-
-	return OK;
-}
-
-static int hib_leave_alarm_module(void *data)
-{
-	int ret;
-
-	retif(data == NULL, FAIL, "Invalid parameter!");
-
-	ret = vconf_notify_key_changed(VCONFKEY_ALARM_STATE,
-				       indicator_alarm_change_cb, data);
-	retif(ret != OK, FAIL, "Failed to register callback!");
-
-	indicator_alarm_change_cb(NULL, data);
-	return OK;
-}
diff --git a/modules/information/noti.c b/modules/information/noti.c
index 6144869..a93248d 100755
--- a/modules/information/noti.c
+++ b/modules/information/noti.c
@@ -30,8 +30,6 @@
 
 static int register_noti_module(void *data);
 static int unregister_noti_module(void);
-static int hib_enter_noti_module(void);
-static int hib_leave_noti_module(void *data);
 
 Indicator_Icon_Object noti[INDICATOR_WIN_MAX] = {
 {
@@ -46,9 +44,7 @@ Indicator_Icon_Object noti[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_NOTI,
 	.exist_in_view = EINA_FALSE,
 	.init = register_noti_module,
-	.fini = unregister_noti_module,
-	.hib_enter = hib_enter_noti_module,
-	.hib_leave = hib_leave_noti_module
+	.fini = unregister_noti_module
 },
 {
 	.win_type = INDICATOR_WIN_LAND,
@@ -62,9 +58,7 @@ Indicator_Icon_Object noti[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_NOTI,
 	.exist_in_view = EINA_FALSE,
 	.init = register_noti_module,
-	.fini = unregister_noti_module,
-	.hib_enter = hib_enter_noti_module,
-	.hib_leave = hib_leave_noti_module
+	.fini = unregister_noti_module
 }
 };
 
@@ -442,16 +436,3 @@ static int unregister_noti_module(void)
 	eina_list_free(status_list);
 	return OK;
 }
-
-static int hib_enter_noti_module(void)
-{
-	return OK;
-}
-
-static int hib_leave_noti_module(void *data)
-{
-	retif(data == NULL, FAIL, "Invalid parameter!");
-	update_noti_module_new(data, NOTIFICATION_TYPE_NOTI);
-	return OK;
-}
-
diff --git a/modules/modules.c b/modules/modules.c
index 47e821b..7534104 100755
--- a/modules/modules.c
+++ b/modules/modules.c
@@ -127,34 +127,6 @@ void indicator_fini_modules(void *data)
 	indicator_icon_all_list_free();
 }
 
-void indicator_hib_enter_modules(void *data)
-{
-	int i;
-	int j = 0;
-
-	for(j=0;j<INDICATOR_WIN_MAX;j++)
-	{
-		for (i = 0; modules[j][i]; i++) {
-			if (modules[j][i]->hib_enter)
-				modules[j][i]->hib_enter();
-		}
-	}
-}
-
-void indicator_hib_leave_modules(void *data)
-{
-	int i;
-	int j = 0;
-
-	for(j=0;j<INDICATOR_WIN_MAX;j++)
-	{
-		for (i = 0; modules[j][i]; i++) {
-			if (modules[j][i]->hib_leave)
-				modules[j][i]->hib_leave(data);
-		}
-	}
-}
-
 void indicator_lang_changed_modules(void *data)
 {
 	int i;
diff --git a/modules/modules.h b/modules/modules.h
index 8de5f6b..636bebd 100755
--- a/modules/modules.h
+++ b/modules/modules.h
@@ -27,8 +27,6 @@
 
 void indicator_init_modules(void *data);
 void indicator_fini_modules(void *data);
-void indicator_hib_enter_modules(void *data);
-void indicator_hib_leave_modules(void *data);
 void indicator_lang_changed_modules(void *data);
 void indicator_region_changed_modules(void *data);
 void indicator_minictrl_control_modules(int action, const char* name, void *data);
diff --git a/modules/network/rssi.c b/modules/network/rssi.c
index 59afe8c..3bfed48 100755
--- a/modules/network/rssi.c
+++ b/modules/network/rssi.c
@@ -34,8 +34,6 @@
 
 static int register_rssi_module(void *data);
 static int unregister_rssi_module(void);
-static int hib_enter_rssi_module(void);
-static int hib_leave_rssi_module(void *data);
 static int language_changed_cb(void *data);
 static int wake_up_cb(void *data);
 
@@ -53,8 +51,6 @@ Indicator_Icon_Object rssi[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_FIXED,
 	.init = register_rssi_module,
 	.fini = unregister_rssi_module,
-	.hib_enter = hib_enter_rssi_module,
-	.hib_leave = hib_leave_rssi_module,
 	.lang_changed = language_changed_cb,
 	.wake_up = wake_up_cb
 },
@@ -71,8 +67,6 @@ Indicator_Icon_Object rssi[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_FIXED,
 	.init = register_rssi_module,
 	.fini = unregister_rssi_module,
-	.hib_enter = hib_enter_rssi_module,
-	.hib_leave = hib_leave_rssi_module,
 	.lang_changed = language_changed_cb,
 	.wake_up = wake_up_cb
 }
@@ -344,30 +338,3 @@ static int unregister_rssi_module(void)
 
 	return OK;
 }
-
-static int hib_enter_rssi_module(void)
-{
-	int ret;
-
-	ret = vconf_ignore_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
-				       indicator_rssi_change_cb);
-	if (ret != OK) {
-		ERR("Failed to unregister callback!");
-	}
-
-	return OK;
-}
-
-static int hib_leave_rssi_module(void *data)
-{
-	int ret;
-
-	retif(data == NULL, FAIL, "Invalid parameter!");
-
-	ret = vconf_notify_key_changed(VCONFKEY_TELEPHONY_FLIGHT_MODE,
-				       indicator_rssi_change_cb, data);
-	retif(ret != OK, FAIL, "Failed to register callback!");
-
-	indicator_rssi_change_cb(NULL, data);
-	return OK;
-}
diff --git a/modules/power/battery.c b/modules/power/battery.c
index b4f6dce..56a08d6 100755
--- a/modules/power/battery.c
+++ b/modules/power/battery.c
@@ -604,10 +604,12 @@ static int register_battery_module(void *data)
 	ret = vconf_notify_key_changed(VCONFKEY_PM_STATE,
 					       indicator_battery_pm_state_change_cb, data);
 	if (ret != OK) {
-		ERR("Fail: register VCONFKEY_REGIONFORMAT_TIME1224");
+		ERR("Fail: register VCONFKEY_PM_STATE");
 		r = r | ret;
 	}
 
+	indicator_battery_update_display(data);
+
 	return r;
 }
 
diff --git a/modules/processing/active_sync.c b/modules/processing/active_sync.c
index fa5f020..d891f2c 100755
--- a/modules/processing/active_sync.c
+++ b/modules/processing/active_sync.c
@@ -31,8 +31,6 @@
 
 static int register_active_sync_module(void *data);
 static int unregister_active_sync_module(void);
-static int hib_enter_active_sync_module(void);
-static int hib_leave_active_sync_module(void *data);
 static int wake_up_cb(void *data);
 
 Indicator_Icon_Object active_sync[INDICATOR_WIN_MAX] = {
@@ -49,8 +47,6 @@ Indicator_Icon_Object active_sync[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_NOTI,
 	.init = register_active_sync_module,
 	.fini = unregister_active_sync_module,
-	.hib_enter = hib_enter_active_sync_module,
-	.hib_leave = hib_leave_active_sync_module,
 	.wake_up = wake_up_cb
 },
 {
@@ -66,8 +62,6 @@ Indicator_Icon_Object active_sync[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_NOTI,
 	.init = register_active_sync_module,
 	.fini = unregister_active_sync_module,
-	.hib_enter = hib_enter_active_sync_module,
-	.hib_leave = hib_leave_active_sync_module,
 	.wake_up = wake_up_cb
 }
 };
@@ -203,19 +197,3 @@ static int unregister_active_sync_module(void)
 
 	return OK;
 }
-
-static int hib_enter_active_sync_module(void)
-{
-	int ret = 0;
-
-	return OK;
-}
-
-static int hib_leave_active_sync_module(void *data)
-{
-	int ret = 0;
-
-	retif(data == NULL, FAIL, "Invalid parameter!");
-
-	return OK;
-}
diff --git a/modules/processing/call_divert.c b/modules/processing/call_divert.c
index 1d09c55..1be278f 100755
--- a/modules/processing/call_divert.c
+++ b/modules/processing/call_divert.c
@@ -29,8 +29,6 @@
 
 static int register_call_divert_module(void *data);
 static int unregister_call_divert_module(void);
-static int hib_enter_call_divert_module(void);
-static int hib_leave_call_divert_module(void *data);
 
 Indicator_Icon_Object call_divert[INDICATOR_WIN_MAX] = {
 {
@@ -46,8 +44,6 @@ Indicator_Icon_Object call_divert[INDICATOR_WIN_MAX] = {
 	.init = register_call_divert_module,
 	.fini = unregister_call_divert_module,
 	.area = INDICATOR_ICON_AREA_SYSTEM,
-	.hib_enter = hib_enter_call_divert_module,
-	.hib_leave = hib_leave_call_divert_module
 },
 {
 	.win_type = INDICATOR_WIN_LAND,
@@ -62,8 +58,6 @@ Indicator_Icon_Object call_divert[INDICATOR_WIN_MAX] = {
 	.init = register_call_divert_module,
 	.fini = unregister_call_divert_module,
 	.area = INDICATOR_ICON_AREA_SYSTEM,
-	.hib_enter = hib_enter_call_divert_module,
-	.hib_leave = hib_leave_call_divert_module
 }
 
 };
@@ -153,29 +147,3 @@ static int unregister_call_divert_module(void)
 
 	return OK;
 }
-
-static int hib_enter_call_divert_module(void)
-{
-	int ret;
-
-	ret = vconf_ignore_key_changed(VCONFKEY_TELEPHONY_CALL_FORWARD_STATE,
-				       indicator_call_divert_change_cb);
-	if (ret != OK)
-		ERR("Failed to unregister callback!");
-
-	return OK;
-}
-
-static int hib_leave_call_divert_module(void *data)
-{
-	int ret;
-
-	retif(data == NULL, FAIL, "Invalid parameter!");
-
-	ret = vconf_notify_key_changed(VCONFKEY_TELEPHONY_CALL_FORWARD_STATE,
-				       indicator_call_divert_change_cb, data);
-	retif(ret != OK, FAIL, "Failed to register callback!");
-
-	indicator_call_divert_change_cb(NULL, data);
-	return OK;
-}
diff --git a/modules/setting/bluetooth.c b/modules/setting/bluetooth.c
index 5747cc2..307f657 100755
--- a/modules/setting/bluetooth.c
+++ b/modules/setting/bluetooth.c
@@ -30,8 +30,6 @@
 
 static int register_bluetooth_module(void *data);
 static int unregister_bluetooth_module(void);
-static int hib_enter_bluetooth_module(void);
-static int hib_leave_bluetooth_module(void *data);
 static int wake_up_cb(void *data);
 
 Indicator_Icon_Object bluetooth[INDICATOR_WIN_MAX] = {
@@ -48,8 +46,6 @@ Indicator_Icon_Object bluetooth[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_SYSTEM,
 	.init = register_bluetooth_module,
 	.fini = unregister_bluetooth_module,
-	.hib_enter = hib_enter_bluetooth_module,
-	.hib_leave = hib_leave_bluetooth_module,
 	.wake_up = wake_up_cb
 },
 {
@@ -65,8 +61,6 @@ Indicator_Icon_Object bluetooth[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_SYSTEM,
 	.init = register_bluetooth_module,
 	.fini = unregister_bluetooth_module,
-	.hib_enter = hib_enter_bluetooth_module,
-	.hib_leave = hib_leave_bluetooth_module,
 	.wake_up = wake_up_cb
 }
 
@@ -333,29 +327,3 @@ static int unregister_bluetooth_module(void)
 
 	return OK;
 }
-
-static int hib_enter_bluetooth_module(void)
-{
-	int ret;
-
-	ret = vconf_ignore_key_changed(VCONFKEY_BT_STATUS,
-				       indicator_bluetooth_change_cb);
-	if (ret != OK)
-		ERR("Failed to unregister callback!");
-
-	return OK;
-}
-
-static int hib_leave_bluetooth_module(void *data)
-{
-	int ret;
-
-	retif(data == NULL, FAIL, "Invalid parameter!");
-
-	ret = vconf_notify_key_changed(VCONFKEY_BT_STATUS,
-				       indicator_bluetooth_change_cb, data);
-	retif(ret != OK, FAIL, "Failed to register callback!");
-
-	indicator_bluetooth_change_cb(NULL, data);
-	return OK;
-}
diff --git a/modules/setting/gps.c b/modules/setting/gps.c
index 111d7b9..8fc882f 100755
--- a/modules/setting/gps.c
+++ b/modules/setting/gps.c
@@ -30,8 +30,6 @@
 
 static int register_gps_module(void *data);
 static int unregister_gps_module(void);
-static int hib_enter_gps_module(void);
-static int hib_leave_gps_module(void *data);
 static int wake_up_cb(void *data);
 
 Indicator_Icon_Object gps[INDICATOR_WIN_MAX] = {
@@ -48,8 +46,6 @@ Indicator_Icon_Object gps[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_NOTI,
 	.init = register_gps_module,
 	.fini = unregister_gps_module,
-	.hib_enter = hib_enter_gps_module,
-	.hib_leave = hib_leave_gps_module,
 	.wake_up = wake_up_cb
 },
 {
@@ -65,8 +61,6 @@ Indicator_Icon_Object gps[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_NOTI,
 	.init = register_gps_module,
 	.fini = unregister_gps_module,
-	.hib_enter = hib_enter_gps_module,
-	.hib_leave = hib_leave_gps_module,
 	.wake_up = wake_up_cb
 }
 };
@@ -285,31 +279,3 @@ static int unregister_gps_module(void)
 
 	return OK;
 }
-
-static int hib_enter_gps_module(void)
-{
-	int ret;
-
-	ret = vconf_ignore_key_changed(VCONFKEY_LOCATION_GPS_STATE,
-				       indicator_gps_change_cb);
-	if (ret != OK)
-		ERR("Failed to unregister callback!");
-
-	return OK;
-}
-
-static int hib_leave_gps_module(void *data)
-{
-	int ret;
-
-	retif(data == NULL, FAIL, "Invalid parameter!");
-
-	ret = vconf_notify_key_changed(VCONFKEY_LOCATION_GPS_STATE,
-				       indicator_gps_change_cb, data);
-	retif(ret != OK, FAIL, "Failed to register callback!");
-
-	indicator_gps_state_icon_set(indicator_gps_state_get(), data);
-
-	return OK;
-}
-
diff --git a/modules/setting/nfc.c b/modules/setting/nfc.c
index 03add7e..fb9c682 100755
--- a/modules/setting/nfc.c
+++ b/modules/setting/nfc.c
@@ -29,8 +29,6 @@
 
 static int register_nfc_module(void *data);
 static int unregister_nfc_module(void);
-static int hib_enter_nfc_module(void);
-static int hib_leave_nfc_module(void *data);
 static int wake_up_cb(void *data);
 
 
@@ -48,8 +46,6 @@ Indicator_Icon_Object nfc[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_SYSTEM,
 	.init = register_nfc_module,
 	.fini = unregister_nfc_module,
-	.hib_enter = hib_enter_nfc_module,
-	.hib_leave = hib_leave_nfc_module,
 	.wake_up = wake_up_cb
 },
 {
@@ -65,8 +61,6 @@ Indicator_Icon_Object nfc[INDICATOR_WIN_MAX] = {
 	.area = INDICATOR_ICON_AREA_SYSTEM,
 	.init = register_nfc_module,
 	.fini = unregister_nfc_module,
-	.hib_enter = hib_enter_nfc_module,
-	.hib_leave = hib_leave_nfc_module,
 	.wake_up = wake_up_cb
 }
 };
@@ -186,29 +180,3 @@ static int unregister_nfc_module(void)
 
 	return OK;
 }
-
-static int hib_enter_nfc_module(void)
-{
-	int ret;
-
-	ret = vconf_ignore_key_changed(VCONFKEY_NFC_STATE,
-				       indicator_nfc_change_cb);
-	if (ret != OK)
-		ERR("Failed to unregister callback!");
-
-	return OK;
-}
-
-static int hib_leave_nfc_module(void *data)
-{
-	int ret;
-
-	retif(data == NULL, FAIL, "Invalid parameter!");
-
-	ret = vconf_notify_key_changed(VCONFKEY_NFC_STATE,
-				       indicator_nfc_change_cb, data);
-	retif(ret != OK, FAIL, "Failed to register callback!");
-
-	indicator_nfc_change_cb(NULL, data);
-	return OK;
-}
diff --git a/modules/setting/silent.c b/modules/setting/silent.c
index 23f2e2b..c1ab457 100755
--- a/modules/setting/silent.c
+++ b/modules/setting/silent.c
@@ -29,8 +29,6 @@
 
 static int register_silent_module(void *data);
 static int unregister_silent_module(void);
-static int hib_enter_silent_module(void);
-static int hib_leave_silent_module(void *data);
 
 Indicator_Icon_Object silent[INDICATOR_WIN_MAX] = {
 {
@@ -45,9 +43,7 @@ Indicator_Icon_Object silent[INDICATOR_WIN_MAX] = {
 	.obj_exist = EINA_FALSE,
 	.area = INDICATOR_ICON_AREA_SYSTEM,
 	.init = register_silent_module,
-	.fini = unregister_silent_module,
-	.hib_enter = hib_enter_silent_module,
-	.hib_leave = hib_leave_silent_module
+	.fini = unregister_silent_module
 },
 {
 	.win_type = INDICATOR_WIN_LAND,
@@ -61,9 +57,7 @@ Indicator_Icon_Object silent[INDICATOR_WIN_MAX] = {
 	.obj_exist = EINA_FALSE,
 	.area = INDICATOR_ICON_AREA_SYSTEM,
 	.init = register_silent_module,
-	.fini = unregister_silent_module,
-	.hib_enter = hib_enter_silent_module,
-	.hib_leave = hib_leave_silent_module
+	.fini = unregister_silent_module
 }
 };
 
@@ -193,41 +187,3 @@ static int unregister_silent_module(void)
 		ERR("Fail: ignore VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL");
 	return OK;
 }
-
-static int hib_enter_silent_module(void)
-{
-	int ret;
-
-	ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL,
-				       indicator_silent_change_cb);
-	if (ret != OK)
-		ERR("H_Fail: ignore VCONFKEY_SETAPPL_SOUND_STATUS_BOOL");
-
-	ret = vconf_ignore_key_changed(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL,
-				       indicator_silent_change_cb);
-	if (ret != OK)
-		ERR("H_Fail: ignore VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL");
-
-	return OK;
-}
-
-static int hib_leave_silent_module(void *data)
-{
-	int ret;
-
-	retif(data == NULL, FAIL, "Invalid parameter!");
-
-	ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL,
-				       indicator_silent_change_cb, data);
-	if (ret != OK)
-		ERR("H_Fail: register VCONFKEY_SETAPPL_SOUND_STATUS_BOOL");
-
-	ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL,
-				       indicator_silent_change_cb, data);
-	if (ret != OK)
-		ERR("H_Fail: register VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL");
-
-	indicator_silent_change_cb(NULL, data);
-
-	return OK;
-}
diff --git a/packaging/org.tizen.indicator.spec b/packaging/org.tizen.indicator.spec
index 0ecb351..7fbba3d 100755
--- a/packaging/org.tizen.indicator.spec
+++ b/packaging/org.tizen.indicator.spec
@@ -4,7 +4,7 @@
 
 Name:       org.tizen.indicator
 Summary:    indicator window
-Version:    0.1.69
+Version:    0.1.71
 Release:    1
 Group:      utils
 License:    Flora Software License
@@ -22,7 +22,6 @@ BuildRequires:  pkgconfig(ecore-evas)
 BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(evas)
 BuildRequires:  pkgconfig(eina)
-BuildRequires:  pkgconfig(heynoti)
 BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(libprivilege-control)
 BuildRequires:  pkgconfig(notification)