Fix destination name

3 files changed, 12 insertions, 16 deletions

diff --git a/alarm-lib.c b/alarm-lib.c
index 66615c8..39b267e 100755
--- a/alarm-lib.c
+++ b/alarm-lib.c
@@ -813,8 +813,8 @@ EXPORT_API int alarmmgr_add_alarm_with_localtime(alarm_entry_t *alarm,
 
 	if (destination != NULL) {
 		memset(dst_service_name, 0,
-		       strlen(destination) + strlen(".ALARM") + 2);
-		snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "%s",
+		       strlen(destination) + strlen("ALARM.") + 2);
+		snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "ALARM.%s",
 			 destination);
 
 		memset(dst_service_name_mod,'a',MAX_SERVICE_NAME_LEN-1);
@@ -835,9 +835,6 @@ EXPORT_API int alarmmgr_add_alarm_with_localtime(alarm_entry_t *alarm,
 	                j++;
 	        }
 
-		strncat(dst_service_name, ".ALARM", strlen(".ALARM"));
-		strncat(dst_service_name_mod, ".ALARM", strlen(".ALARM"));
-
 		if (!_send_alarm_create
 		    (alarm_context, alarm_info, alarm_id, dst_service_name, dst_service_name_mod,
 		     &error_code)) {
@@ -1017,8 +1014,8 @@ EXPORT_API int alarmmgr_add_alarm(int alarm_type, time_t trigger_at_time,
 
 	if (destination != NULL) {
 		memset(dst_service_name, 0,
-		       strlen(destination) + strlen(".ALARM") + 2);
-		snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "%s",
+		       strlen(destination) + strlen("ALARM.") + 2);
+		snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "ALARM.%s",
 			 destination);
 		memset(dst_service_name_mod,'a',MAX_SERVICE_NAME_LEN-1);
 
@@ -1038,9 +1035,6 @@ EXPORT_API int alarmmgr_add_alarm(int alarm_type, time_t trigger_at_time,
 	                j++;
 	        }
 
-		strncat(dst_service_name, ".ALARM", strlen(".ALARM"));
-		strncat(dst_service_name_mod, ".ALARM", strlen(".ALARM"));
-
 		if (!_send_alarm_create
 		    (alarm_context, &alarm_info, alarm_id, dst_service_name,dst_service_name_mod,
 		     &error_code)) {
@@ -1135,7 +1129,7 @@ EXPORT_API int alarmmgr_remove_alarm(alarm_id_t alarm_id)
 	if (ret < 0)
 		return ret;
 
-	ALARM_MGR_LOG_PRINT("[alarm-lib]:alarm_delete() is called\n");
+	ALARM_MGR_LOG_PRINT("[alarm-lib]:alarm_delete(%d) is called\n", alarm_id);
 
 	if (alarm_id <= 0) {
 		return ERR_ALARM_INVALID_ID;
@@ -1300,8 +1294,8 @@ int alarmmgr_create(alarm_info_t *alarm_info, char *destination,
 
 	if (destination != NULL) {
 		memset(dst_service_name, 0,
-		       strlen(destination) + strlen(".ALARM") + 2);
-		snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "%s.ALARM",
+		       strlen(destination) + strlen("ALARM.") + 2);
+		snprintf(dst_service_name, MAX_SERVICE_NAME_LEN, "ALARM.%s",
 			 destination);
 		if (!_send_alarm_create
 		    (alarm_context, alarm_info, alarm_id, dst_service_name,"null",
diff --git a/alarm-manager.c b/alarm-manager.c
index f99a1d5..cb960f8 100755
--- a/alarm-manager.c
+++ b/alarm-manager.c
@@ -1529,11 +1529,11 @@ static void __alarm_expired()
 				if (strncmp
 			    		(g_quark_to_string(__alarm_info->quark_dst_service_name),
 					     "null",4) == 0) {
-					strncpy(appid,g_quark_to_string(__alarm_info->quark_app_service_name),strlen(g_quark_to_string(__alarm_info->quark_app_service_name))-6);
+					strncpy(appid,g_quark_to_string(__alarm_info->quark_app_service_name)+6,strlen(g_quark_to_string(__alarm_info->quark_app_service_name))-6);
 				}
 				else
 				{
-					strncpy(appid,g_quark_to_string(__alarm_info->quark_dst_service_name),strlen(g_quark_to_string(__alarm_info->quark_dst_service_name))-6);
+					strncpy(appid,g_quark_to_string(__alarm_info->quark_dst_service_name)+6,strlen(g_quark_to_string(__alarm_info->quark_dst_service_name))-6);
 				}
 
 				snprintf(alarm_id_str, 31, "%d", alarm_id);
@@ -2630,6 +2630,8 @@ static DBusHandlerResult __alarm_server_filter(DBusConnection *connection,
 			if (entry->data) {
 				expire_info = (__expired_alarm_t *) entry->data;
 
+				ALARM_MGR_LOG_PRINT("service_name(%s), service(%s)", expire_info->service_name, service);
+
 				if (strcmp(expire_info->service_name, service)
 				    == 0) {
 					ALARM_MGR_EXCEPTION_PRINT(
diff --git a/packaging/alarm-manager.spec b/packaging/alarm-manager.spec
index 31099ac..bba33f4 100755
--- a/packaging/alarm-manager.spec
+++ b/packaging/alarm-manager.spec
@@ -1,6 +1,6 @@
 Name:       alarm-manager
 Summary:    Alarm library
-Version:    0.4.80
+Version:    0.4.81
 Release:    1
 Group:      System/Libraries
 License:    Apache License, Version 2.0