e_policy_visibility: remove the duplicated conditions for exceptions

Check the exceptions at only e_policy_client_iconify_by_visibility() function

Change-Id: I48fa5fb5f14aa2afa15bd2f7b88e30e0ebfe5904

diff --git a/src/bin/e_policy.c b/src/bin/e_policy.c
index 47ca36a..3af13c7 100644 (file)
--- a/src/bin/e_policy.c
+++ b/src/bin/e_policy.c
@@ -803,15 +803,7 @@ _e_policy_cb_hook_client_visibility(void *d EINA_UNUSED, E_Client *ec)
                }
              else if (ec->zone->display_state == E_ZONE_DISPLAY_STATE_OFF)
                {
-                  if (e_client_util_ignored_get(ec)) return;
-                  if (e_client_is_iconified_by_client(ec)) return;
-                  if (ec->bg_state) return;
-                  if (ec->exp_iconify.skip_iconify) return;
-                  if (ec->exp_iconify.skip_by_remote) return;
-                  if (!ec->iconic)
-                    {
-                       e_policy_client_iconify_by_visibility(ec);
-                    }
+                  e_policy_client_iconify_by_visibility(ec);
                }
           }
      }

diff --git a/src/bin/e_policy_visibility.c b/src/bin/e_policy_visibility.c
index af9f0f1..e89e8f9 100644 (file)
--- a/src/bin/e_policy_visibility.c
+++ b/src/bin/e_policy_visibility.c
@@ -282,16 +282,6 @@ _e_policy_client_iconify_by_visibility(E_Client *ec)
 {
    int skip_iconify = 0;
 
-   if (!ec) return;
-   if (ec->iconic) return;
-   if (e_client_is_iconified_by_client(ec)) return;
-   if (ec->bg_state) return;
-   if (ec->exp_iconify.skip_iconify) return;
-   if (ec->exp_iconify.skip_by_remote) return;
-
-   E_Comp_Wl_Client_Data *cdata = (E_Comp_Wl_Client_Data *)ec->comp_data;
-   if (cdata && !cdata->mapped) return;
-
    if (e_config->transient.iconify)
      {
         if (_e_policy_check_transient_child_visible(ec, ec))
@@ -326,7 +316,7 @@ _e_policy_client_iconify_by_visibility(E_Client *ec)
      {
         if (ec->parent->visibility.obscured == E_VISIBILITY_FULLY_OBSCURED)
           {
-             _e_policy_client_iconify_by_visibility(ec->parent);
+             e_policy_client_iconify_by_visibility(ec->parent);
 
              E_VIS_CLIENT_GET(vc, ec->parent);
              if (vc)
@@ -477,7 +467,19 @@ e_policy_client_visibility_send(E_Client *ec)
 EINTERN void
 e_policy_client_iconify_by_visibility(E_Client *ec)
 {
+   E_Comp_Wl_Client_Data *cdata;
+
    if (!ec) return;
+   if (ec->iconic) return;
+   if (ec->bg_state) return;
+   if (ec->exp_iconify.skip_iconify) return;
+   if (ec->exp_iconify.skip_by_remote) return;
+   if (e_client_util_ignored_get(ec)) return;
+   if (e_client_is_iconified_by_client(ec)) return;
+
+   cdata = (E_Comp_Wl_Client_Data *)ec->comp_data;
+   if (cdata && !cdata->mapped) return;
+
    _e_policy_client_iconify_by_visibility(ec);
 }