e_policy_stack: remove the unused arguments at e_policy_stack_check_above_lockscreen

The new_layer and set_layer ags are not used anywhere, so delete them.

Change-Id: I803873d2708c219911604893e44a28d3c3aa03f5

diff --git a/src/bin/e_policy.c b/src/bin/e_policy.c
index 1f91d32..47ca36a 100644 (file)
--- a/src/bin/e_policy.c
+++ b/src/bin/e_policy.c
@@ -1112,6 +1112,8 @@ _e_policy_cb_client_move(void *data EINA_UNUSED, int type EINA_UNUSED, void *eve
 {
    E_Event_Client *ev;
    E_Client *ec;
+   int zx, zy, zw, zh;
+   int ex, ey, ew, eh;
 
    ev = event;
    if (!ev) goto end;
@@ -1326,7 +1328,7 @@ _e_policy_cb_client_show(void *data EINA_UNUSED, int type EINA_UNUSED, void *eve
    if (!ev) return ECORE_CALLBACK_PASS_ON;
 
    ec = ev->ec;
-   e_policy_stack_check_above_lockscreen(ec, ec->layer, NULL, EINA_TRUE);
+   e_policy_stack_check_above_lockscreen(ec, ec->layer);
 
    return ECORE_CALLBACK_PASS_ON;
 }

diff --git a/src/bin/e_policy.h b/src/bin/e_policy.h
index 31423a5..8dc67ad 100644 (file)
--- a/src/bin/e_policy.h
+++ b/src/bin/e_policy.h
@@ -268,7 +268,7 @@ EINTERN void             e_policy_stack_below(E_Client *ec, E_Client *below_ec);
 EINTERN void             e_policy_stack_above(E_Client *ec, E_Client *above_ec);
 
 EINTERN void             e_policy_stack_clients_restack_above_lockscreen(E_Client *ec_lock, Eina_Bool show);
-EINTERN Eina_Bool        e_policy_stack_check_above_lockscreen(E_Client *ec, E_Layer layer, E_Layer *new_layer, Eina_Bool set_layer);
+EINTERN Eina_Bool        e_policy_stack_check_above_lockscreen(E_Client *ec, E_Layer layer);
 
 
 EINTERN void             e_policy_interceptors_clean(void);

diff --git a/src/bin/e_policy_stack.c b/src/bin/e_policy_stack.c
index 74e62fd..9e39536 100644 (file)
--- a/src/bin/e_policy_stack.c
+++ b/src/bin/e_policy_stack.c
@@ -673,7 +673,7 @@ e_policy_stack_clients_restack_above_lockscreen(E_Client *ec_lock, Eina_Bool sho
 }
 
 EINTERN Eina_Bool
-e_policy_stack_check_above_lockscreen(E_Client *ec, E_Layer layer, E_Layer *new_layer, Eina_Bool set_layer)
+e_policy_stack_check_above_lockscreen(E_Client *ec, E_Layer layer)
 {
    E_Layer lock_layer;
 
@@ -693,31 +693,20 @@ e_policy_stack_check_above_lockscreen(E_Client *ec, E_Layer layer, E_Layer *new_
                   ec->changable_layer[E_CHANGABLE_LAYER_TYPE_ABOVE_NOTIFICATION].saved_layer = ec->layer;
                }
 
-             if (set_layer)
-               {
-                  ELOGF("CHANGE to Lockscreen layer", "AboveLock|layer: %d -> %d", ec, ec->layer, lock_layer);
-                  if (ec->layer == lock_layer)
-                    e_client_raise(ec);
-                  else
-                    e_client_layer_set(ec, lock_layer);
-               }
+               ELOGF("CHANGE to Lockscreen layer", "AboveLock|layer: %d -> %d", ec, ec->layer, lock_layer);
+               if (ec->layer == lock_layer)
+                 e_client_raise(ec);
+               else
+                 e_client_layer_set(ec, lock_layer);
 
-             if (new_layer)
-               *new_layer = lock_layer;
           }
         else
           {
-             if (set_layer)
+             if (ec->layer != layer)
                {
-                  if (ec->layer != layer)
-                    {
-                       ELOGF("CHANGE to Lockscreen layer", "AboveLock|layer: %d -> %d", ec, ec->layer, lock_layer);
-                       e_client_layer_set(ec, lock_layer);
-                    }
+                  ELOGF("CHANGE to Lockscreen layer", "AboveLock|layer: %d -> %d", ec, ec->layer, lock_layer);
+                  e_client_layer_set(ec, lock_layer);
                }
-
-             if (new_layer)
-               *new_layer = layer;
           }
 
         return EINA_TRUE;

diff --git a/src/bin/e_policy_visibility.c b/src/bin/e_policy_visibility.c
index 558f647..af9f0f1 100644 (file)
--- a/src/bin/e_policy_visibility.c
+++ b/src/bin/e_policy_visibility.c
@@ -1629,7 +1629,7 @@ _e_vis_client_job_exec_by_type(E_Vis_Client *vc, E_Vis_Job_Type type)
          if (e_policy_client_is_lockscreen(ec))
            e_policy_stack_clients_restack_above_lockscreen(ec, EINA_TRUE);
          else
-           e_policy_stack_check_above_lockscreen(ec, ec->layer, NULL, EINA_TRUE);
+           e_policy_stack_check_above_lockscreen(ec, ec->layer);
          break;
       case E_VIS_JOB_TYPE_UNICONIFY:
          if (ec->visibility.force_obscured) break;

diff --git a/src/bin/e_policy_wl.c b/src/bin/e_policy_wl.c
index 3285b8f..182b2c6 100644 (file)
--- a/src/bin/e_policy_wl.c
+++ b/src/bin/e_policy_wl.c
@@ -1413,7 +1413,7 @@ e_policy_wl_activate(E_Client *ec)
    if (e_policy_client_is_lockscreen(ec))
      e_policy_stack_clients_restack_above_lockscreen(ec, EINA_TRUE);
    else
-     e_policy_stack_check_above_lockscreen(ec, ec->layer, NULL, EINA_TRUE);
+     e_policy_stack_check_above_lockscreen(ec, ec->layer);
 }
 
 static void
@@ -1962,7 +1962,7 @@ _tzpol_iface_cb_notilv_set(struct wl_client *client, struct wl_resource *res_tzp
    if (e_policy_client_is_lockscreen(ec))
      e_policy_stack_clients_restack_above_lockscreen(ec, EINA_TRUE);
    else
-     e_policy_stack_check_above_lockscreen(ec, ec->layer, NULL, EINA_TRUE);
+     e_policy_stack_check_above_lockscreen(ec, ec->layer);
 }
 
 EINTERN void