fix LICENSE and property set

diff --git a/LICENSE b/LICENSE.Flora
similarity index 100%
rename from LICENSE
rename to LICENSE.Flora

diff --git a/NOTICE b/NOTICE
index e5fc676..5fa11d2 100755 (executable)
--- a/NOTICE
+++ b/NOTICE
@@ -1 +1,3 @@
-Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
\ No newline at end of file
+Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Flora License, Version 1.
+Please, see the LICENSE file for Flora License terms and conditions.

diff --git a/include/lockd-window-mgr.h b/include/lockd-window-mgr.h
index 27e837e..c847ac8 100755 (executable)
--- a/include/lockd-window-mgr.h
+++ b/include/lockd-window-mgr.h
@@ -21,11 +21,11 @@
 
 typedef struct _lockw_data lockw_data;
 
-void
+Eina_Bool
 lockd_window_set_window_property(lockw_data * data, int lock_app_pid,
                                 void *event);
 
-void
+Eina_Bool
 lockd_window_set_window_effect(lockw_data * data, int lock_app_pid,
                               void *event);
 

diff --git a/src/lock-daemon.c b/src/lock-daemon.c
index f361823..ed445f3 100755 (executable)
--- a/src/lock-daemon.c
+++ b/src/lock-daemon.c
@@ -136,6 +136,13 @@ _lockd_notify_lock_state_cb(keynode_t * node, void *data)
        }
 }
 
+static Eina_Bool lockd_set_lock_state_cb(void *data)
+{
+       LOCKD_DBG("%s, %d", __func__, __LINE__);
+       vconf_set_int(VCONFKEY_IDLE_LOCK_STATE, VCONFKEY_IDLE_LOCK);
+       return ECORE_CALLBACK_CANCEL;
+}
+
 static void
 _lockd_notify_phone_lock_verification_cb(keynode_t * node, void *data)
 {
@@ -177,13 +184,6 @@ static int lockd_app_dead_cb(int pid, void *data)
        return 0;
 }
 
-static Eina_Bool lockd_set_lock_state_cb(void *data)
-{
-       LOCKD_DBG("%s, %d", __func__, __LINE__);
-       vconf_set_int(VCONFKEY_IDLE_LOCK_STATE, VCONFKEY_IDLE_LOCK);
-       return ECORE_CALLBACK_CANCEL;
-}
-
 static Eina_Bool lockd_app_create_cb(void *data, int type, void *event)
 {
        struct lockd_data *lockd = (struct lockd_data *)data;
@@ -192,11 +192,13 @@ static Eina_Bool lockd_app_create_cb(void *data, int type, void *event)
                return ECORE_CALLBACK_PASS_ON;
        }
        LOCKD_DBG("%s, %d", __func__, __LINE__);
-       lockd_window_set_window_effect(lockd->lockw, lockd->lock_app_pid,
-                                      event);
-       lockd_window_set_window_property(lockd->lockw, lockd->lock_app_pid,
-                                        event);
-
+       if (lockd_window_set_window_effect(lockd->lockw, lockd->lock_app_pid,
+                                      event) == EINA_TRUE) {
+               if(lockd_window_set_window_property(lockd->lockw, lockd->lock_app_pid,
+                                                event) == EINA_FALSE) {
+                       LOCKD_ERR("window is not matched..!!");
+               }
+       }
        return ECORE_CALLBACK_PASS_ON;
 }
 
@@ -208,11 +210,12 @@ static Eina_Bool lockd_app_show_cb(void *data, int type, void *event)
                return EINA_TRUE;
        }
        LOCKD_DBG("%s, %d", __func__, __LINE__);
-       lockd_window_set_window_property(lockd->lockw, lockd->lock_app_pid,
-                                        event);
-       if (lockd->lock_type > 1)
-               ecore_idler_add(lockd_set_lock_state_cb, NULL);
-
+       if (lockd_window_set_window_property(lockd->lockw, lockd->lock_app_pid,
+                                        event)) {
+               if (lockd->lock_type > 1) {
+                       ecore_idler_add(lockd_set_lock_state_cb, NULL);
+               }
+       }
        return EINA_FALSE;
 }
 

diff --git a/src/lockd-window-mgr.c b/src/lockd-window-mgr.c
index 45cb16e..3ce8900 100755 (executable)
--- a/src/lockd-window-mgr.c
+++ b/src/lockd-window-mgr.c
@@ -125,9 +125,10 @@ static Window get_user_created_window(Window win)
        XFree((void *)prop_ret);
 
        return xid;
+
 }
 
-void
+Eina_Bool
 lockd_window_set_window_property(lockw_data * data, int lock_app_pid,
                                 void *event)
 {
@@ -137,7 +138,7 @@ lockd_window_set_window_property(lockw_data * data, int lock_app_pid,
        int pid = 0;
 
        if (!lockw) {
-               return;
+               return EINA_FALSE;
        }
        LOCKD_DBG("%s, %d", __func__, __LINE__);
 
@@ -145,7 +146,7 @@ lockd_window_set_window_property(lockw_data * data, int lock_app_pid,
 
        int ret = ecore_x_netwm_pid_get(user_window, &pid);
        if(ret != 1) {
-               return;
+               return EINA_FALSE;
        }
 
        LOCKD_DBG("Check PID(%d) window. (lock_app_pid : %d)\n", pid,
@@ -169,11 +170,13 @@ lockd_window_set_window_property(lockw_data * data, int lock_app_pid,
                        utilx_set_window_opaque_state(ecore_x_display_get(),
                                                      user_window,
                                                      UTILX_OPAQUE_STATE_ON);
+                       return EINA_TRUE;
                }
        }
+       return EINA_FALSE;
 }
 
-void
+Eina_Bool
 lockd_window_set_window_effect(lockw_data * data, int lock_app_pid, void *event)
 {
        Ecore_X_Event_Window_Create *e = event;
@@ -200,8 +203,10 @@ lockd_window_set_window_effect(lockw_data * data, int lock_app_pid, void *event)
 
                        utilx_set_window_effect_state(ecore_x_display_get(),
                                                      user_window, 0);
+                       return EINA_TRUE;
                }
        }
+       return EINA_FALSE;
 }
 
 void lockd_window_set_phonelock_pid(lockw_data * data, int phone_lock_pid)