e_policy: remove E_CLIENT_HOOK_EVAL_PRE_FETCH callback

The policy code in the callback function move to the e_clietn_idler_before function

Change-Id: I1745fdf9861ac430e31bfdd777d3c0040e92270c

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index dd567c91410fb11b8bca55a36372708c6715846f..fca94ae880cd6c003e809a6ad068f910c01caf31 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -25,6 +25,7 @@
 #include "e_hwc_window_intern.h"
 #include "e_canvas_intern.h"
 #include "e_policy_visibility_intern.h"
+#include "e_policy_stack_intern.h"
 
 #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec)))
 
@@ -2739,6 +2740,7 @@ e_client_idler_before(Eina_Bool *check_focus)
         // call hooks to decide what to do - maybe move/resize
         if (ec->ignored || (!ec->changed)) continue;
 
+        e_policy_stack_transient_for_fetch(ec);
         if (!_e_client_hook_call(E_CLIENT_HOOK_EVAL_PRE_FETCH, ec)) continue;
 
 

diff --git a/src/bin/windowmgr/e_policy.c b/src/bin/windowmgr/e_policy.c
index d61ff6f04b42d19b12ce98ab65fc8f993998466c..4e10e2fdfb2ae568c789ad6ba0415a69f8531033 100644 (file)
--- a/src/bin/windowmgr/e_policy.c
+++ b/src/bin/windowmgr/e_policy.c
@@ -86,7 +86,6 @@ static void        _e_policy_desk_client_add_hook_add(E_Policy_Client *pc);
 static void        _e_policy_desk_client_add_hook_delete(E_Policy_Client *pc);
 
 static void        _e_policy_cb_hook_client_eval_pre_new_client(void *d EINA_UNUSED, E_Client *ec);
-static void        _e_policy_cb_hook_client_eval_pre_fetch(void *d EINA_UNUSED, E_Client *ec);
 static void        _e_policy_cb_hook_client_eval_pre_post_fetch(void *d EINA_UNUSED, E_Client *ec);
 static void        _e_policy_cb_hook_client_eval_post_fetch(void *d EINA_UNUSED, E_Client *ec);
 static void        _e_policy_cb_hook_client_eval_post_new_client(void *d EINA_UNUSED, E_Client *ec);
@@ -580,14 +579,6 @@ _e_policy_cb_hook_client_eval_pre_new_client(void *d EINA_UNUSED, E_Client *ec)
      }
 }
 
-static void
-_e_policy_cb_hook_client_eval_pre_fetch(void *d EINA_UNUSED, E_Client *ec)
-{
-   if (e_object_is_del(E_OBJECT(ec))) return;
-
-   e_policy_stack_transient_for_fetch(ec);
-}
-
 static void
 _e_policy_cb_hook_client_eval_pre_post_fetch(void *d EINA_UNUSED, E_Client *ec)
 {
@@ -2390,7 +2381,6 @@ e_policy_init(void)
    E_LIST_HANDLER_APPEND(handlers, E_EVENT_CLIENT_ZONE_SET,           _e_policy_cb_client_zone_set,                 NULL);
 
    E_CLIENT_HOOK_APPEND(hooks_ec,  E_CLIENT_HOOK_EVAL_PRE_NEW_CLIENT, _e_policy_cb_hook_client_eval_pre_new_client, NULL);
-   E_CLIENT_HOOK_APPEND(hooks_ec,  E_CLIENT_HOOK_EVAL_PRE_FETCH,      _e_policy_cb_hook_client_eval_pre_fetch,      NULL);
    E_CLIENT_HOOK_APPEND(hooks_ec,  E_CLIENT_HOOK_EVAL_PRE_POST_FETCH, _e_policy_cb_hook_client_eval_pre_post_fetch, NULL);
    E_CLIENT_HOOK_APPEND(hooks_ec,  E_CLIENT_HOOK_EVAL_POST_FETCH,     _e_policy_cb_hook_client_eval_post_fetch,     NULL);
    E_CLIENT_HOOK_APPEND(hooks_ec,  E_CLIENT_HOOK_EVAL_POST_NEW_CLIENT,_e_policy_cb_hook_client_eval_post_new_client,NULL);