Fix scripts which cause set date & time failure at first boot

[framework/appfw/alarm-manager.git] / alarm-manager.c

diff --git a/alarm-manager.c b/alarm-manager.c
index a8cd1be..831842c 100755 (executable)
--- a/alarm-manager.c
+++ b/alarm-manager.c
@@ -1352,11 +1352,11 @@ static void __alarm_expired()
 
        interval = difftime(alarm_context.c_due_time, current_time);
        ALARM_MGR_LOG_PRINT("[alarm-server]: c_due_time(%d), "
-               "current_time(%d), interval(%d)\n", alarm_context.c_due_time, 
+               "current_time(%d), interval(%d)\n", alarm_context.c_due_time,
                current_time, interval);
 
-       if (alarm_context.c_due_time <= current_time - 1) {
-               ALARM_MGR_LOG_PRINT("Wrong alarm is expired\n");
+       if (alarm_context.c_due_time > current_time) {
+               ALARM_MGR_LOG_PRINT("[alarm-server]: False Alarm\n");
                goto done;
        }
 
@@ -1388,7 +1388,7 @@ static void __alarm_expired()
                                {
                                        snprintf(alarm_id_val,31,"%d",alarm_id);
 
-                                       if (bundle_add(b,"http://tizen.org/appsvc/data/alarm_id", alarm_id_val)){
+                                       if (bundle_add(b,"http://tizen.org/appcontrol/data/alarm_id", alarm_id_val)){
                                                ALARM_MGR_EXCEPTION_PRINT("Unable to add alarm id to the bundle\n");
                                        }
                                        else
@@ -1464,7 +1464,7 @@ static void __alarm_expired()
                             dbus_g_connection_get_connection(alarm_context.bus),
                             destination_app_service_name, NULL) == FALSE) {
                                __expired_alarm_t *expire_info;
-                               char pkg_name[MAX_SERVICE_NAME_LEN] = { 0, };
+                               char appid[MAX_SERVICE_NAME_LEN] = { 0, };
                                char alarm_id_str[32] = { 0, };
 
                                expire_info = malloc(sizeof(__expired_alarm_t));
@@ -1483,22 +1483,22 @@ static void __alarm_expired()
                                if (strncmp
                                        (g_quark_to_string(__alarm_info->quark_dst_service_name),
                                             "null",4) == 0) {
-                                       strncpy(pkg_name,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),strlen(g_quark_to_string(__alarm_info->quark_app_service_name))-6);
                                }
                                else
                                {
-                                       strncpy(pkg_name,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),strlen(g_quark_to_string(__alarm_info->quark_dst_service_name))-6);
                                }
 
                                snprintf(alarm_id_str, 31, "%d", alarm_id);
 
-                               ALARM_MGR_LOG_PRINT("before aul_launch pkg_name(%s) "
-                                       "alarm_id_str(%s)\n", pkg_name, alarm_id_str);
+                               ALARM_MGR_LOG_PRINT("before aul_launch appid(%s) "
+                                       "alarm_id_str(%s)\n", appid, alarm_id_str);
 
                                bundle *kb;
                                kb = bundle_create();
                                bundle_add(kb, "__ALARM_MGR_ID", alarm_id_str);
-                               aul_launch_app(pkg_name, kb);
+                               aul_launch_app(appid, kb);
                                bundle_free(kb);
                        } else {
                                ALARM_MGR_LOG_PRINT(
@@ -1624,6 +1624,7 @@ static void __on_system_time_changed(keynode_t *node, void *data)
        _set_time(_time);
 
        vconf_set_dbl(VCONFKEY_SYSTEM_TIMEDIFF, diff_time);
+       vconf_set_int(VCONFKEY_SYSTEM_TIME_CHANGED,(int)diff_time);
 
        if (heynoti_publish(SYSTEM_TIME_CHANGED))
                ALARM_MGR_EXCEPTION_PRINT("alarm-server: Unable to publish heynoti for system time change\n");