Add changed callback call logic when register servicesubmit/tizen/20160418.082708accepted/tizen/wearable/20160418.235452accepted/tizen/tv/20160418.235504accepted/tizen/mobile/20160418.235457accepted/tizen/ivi/20160418.235520accepted/tizen/common/20160418.141909

Change-Id: I79732437ba62d5d3e096afe937899c1a7b969335
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>

2 files changed, 8 insertions, 6 deletions

diff --git a/src/badge_internal.c b/src/badge_internal.c
index 28725bb..a013847 100755
--- a/src/badge_internal.c
+++ b/src/badge_internal.c
@@ -922,12 +922,6 @@ int _badge_register_changed_cb(badge_change_cb callback, void *data)
 	if (!callback)
 		return BADGE_ERROR_INVALID_PARAMETER;
 
-	ret = _badge_changed_monitor_init();
-	if (ret != BADGE_ERROR_NONE) {
-		ERR("badge_ipc_monitor_init err : %d", ret);
-		return ret;
-	}
-
 	found = g_list_find_custom(g_badge_cb_list, (gconstpointer)callback,
 			_badge_data_compare);
 
@@ -946,6 +940,13 @@ int _badge_register_changed_cb(badge_change_cb callback, void *data)
 
 		g_badge_cb_list = g_list_append(g_badge_cb_list, bd);
 	}
+
+	ret = _badge_changed_monitor_init();
+	if (ret != BADGE_ERROR_NONE) {
+		ERR("badge_ipc_monitor_init err : %d", ret);
+		_badge_unregister_changed_cb(callback);
+		return ret;
+	}
 	return BADGE_ERROR_NONE;
 }
 
diff --git a/src/badge_ipc.c b/src/badge_ipc.c
index 6b6d279..7b16c5c 100755
--- a/src/badge_ipc.c
+++ b/src/badge_ipc.c
@@ -377,6 +377,7 @@ static int _send_service_register()
 	if (reply)
 		g_object_unref(reply);
 
+	badge_changed_cb_call(BADGE_ACTION_SERVICE_READY, NULL, 0);
 	DBG("_send_service_register dones");
 	return result;
 }