Sync magnolia to RSA.

diff --git a/src/_genlist.c b/src/_genlist.c
index 7f143052283d843b03768ed57742ccaf0b176f1a..b0c0403e6157e38d89733b60663ce1be56906ef4 100755 (executable)
--- a/src/_genlist.c
+++ b/src/_genlist.c
@@ -279,7 +279,7 @@ _D("func\n");
                } else {
                        _unset_notification_level(info->ad->win);
 
-                       if (!strcmp(info->pkg_name, "org.samsung.phone")) {
+                       if (!strcmp(info->pkg_name, "org.tizen.phone")) {
                                /* exception : Because dialer doesn't need bundle
                                 * since being unifyed dialer, voice call and video call
                                 */

diff --git a/src/_logic.c b/src/_logic.c
index a90d2c462351814e2e894f19b88d7011bfcc60c4..48a6ead37f1c3b443da9c9f35b08ae116975bb35 100755 (executable)
--- a/src/_logic.c
+++ b/src/_logic.c
@@ -205,7 +205,7 @@ static Eina_Bool __climsg_cb(void *data, int type, void *event)
 
        if(ev == NULL) {
                _E("Invalid argument: event is NULL\n");
-               ecore_timer_add(0.3, _exit_cb, NULL);
+               _exit_cb(ad);
                return ECORE_CALLBACK_CANCEL;
        }
 

diff --git a/src/taskmanager.c b/src/taskmanager.c
index 11a690fdb75d4c91a53d41cfa439008c97849e3f..e45b5f40411346dc809af767f2098bfbaabb481b 100755 (executable)
--- a/src/taskmanager.c
+++ b/src/taskmanager.c
@@ -119,21 +119,19 @@ int _get_vconf_idlelock(void)
        return lock == (VCONFKEY_IDLE_LOCK ? IDLELOCK_ON : IDLELOCK_OFF);
 }
 
-Eina_Bool _exit_cb(void *data)
+void _exit_cb(void *data)
 {
        struct appdata *ad = (struct appdata *)data;
+       int lock = IDLELOCK_ON;
+       lock = _get_vconf_idlelock();
 
-       if(ad->exit_timer == NULL)
-               return ECORE_CALLBACK_CANCEL;
-
-       ad->exit_timer = NULL;
-       if(_get_vconf_idlelock() == IDLELOCK_OFF){
+       _D("lock(%d)\n", lock);
+       if(lock == IDLELOCK_OFF){
                elm_exit();
        }
        else{
                _D("IDLELOCK is set, taskmnager doesn't exit\n");
        }
-       return ECORE_CALLBACK_CANCEL;
 }
 
 void _key_grab(struct appdata *ad)

diff --git a/src/taskmanager.h b/src/taskmanager.h
index b5cb73022994cdb031ab4d0e30f2dc160018f622..5766a8e0b5fb830dccbfa046a937f196f78aec88 100755 (executable)
--- a/src/taskmanager.h
+++ b/src/taskmanager.h
@@ -122,7 +122,7 @@ enum task_status {
 Evas_Object *load_edj(Evas_Object *parent, const char *file, const char *group);
 int _unset_notification_level(Evas_Object *win);
 int _set_notification_level(Evas_Object *win, Utilx_Notification_Level level);
-Eina_Bool _exit_cb(void *data);
+void _exit_cb(void *data);
 
 #endif
 /* __TASKMANAGER_H___ */