e_client: define E_CLIENT_HOOK_APPEND macro at e.h

Remove other definitions at files except for e.h file.

Change-Id: I04a114bebae1f2253fc6ebd74e819efee68ddd4e

diff --git a/src/bin/e.h b/src/bin/e.h
index f49e04c..1294fe9 100644 (file)
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -286,6 +286,16 @@ typedef struct _E_Rect         E_Rect;
     } \
   while (0)
 
+#define E_CLIENT_HOOK_APPEND(list, type, callback, data) \
+  do \
+    { \
+       E_Client_Hook *_ch; \
+       _ch = e_client_hook_add(type, callback, data); \
+       assert(_ch); \
+       list = eina_list_append(list, _ch); \
+    } \
+  while (0)
+
 # define E_CLAMP(x, min, max) (x < min ? min : (x > max ? max : x))
 # define E_RECTS_CLIP_TO_RECT(_x, _y, _w, _h, _cx, _cy, _cw, _ch) \
   {                                                               \

diff --git a/src/bin/e_comp_wl_rsm.c b/src/bin/e_comp_wl_rsm.c
index 72e9699..d7d5ee9 100644 (file)
--- a/src/bin/e_comp_wl_rsm.c
+++ b/src/bin/e_comp_wl_rsm.c
@@ -3622,17 +3622,6 @@ e_comp_wl_remote_surface_consumers_get(E_Client *ec)
    return consumer_ec_l;
 }
 
-#undef E_CLIENT_HOOK_APPEND
-#define E_CLIENT_HOOK_APPEND(l, t, cb, d) \
-  do                                      \
-    {                                     \
-       E_Client_Hook *_h;                 \
-       _h = e_client_hook_add(t, cb, d);  \
-       assert(_h);                        \
-       l = eina_list_append(l, _h);       \
-    }                                     \
-  while (0)
-
 EINTERN void
 e_comp_wl_remote_surface_init(void)
 {

diff --git a/src/bin/e_policy.c b/src/bin/e_policy.c
index 8b05256..0621ea2 100644 (file)
--- a/src/bin/e_policy.c
+++ b/src/bin/e_policy.c
@@ -2358,17 +2358,6 @@ e_policy_deferred_job(void)
 }
 
 
-#undef E_CLIENT_HOOK_APPEND
-#define E_CLIENT_HOOK_APPEND(l, t, cb, d) \
-  do                                      \
-    {                                     \
-       E_Client_Hook *_h;                 \
-       _h = e_client_hook_add(t, cb, d);  \
-       assert(_h);                        \
-       l = eina_list_append(l, _h);       \
-    }                                     \
-  while (0)
-
 #undef E_PIXMAP_HOOK_APPEND
 #define E_PIXMAP_HOOK_APPEND(l, t, cb, d) \
   do                                      \

diff --git a/src/bin/e_policy_wl_display.c b/src/bin/e_policy_wl_display.c
index 06fb9cf..26a0cfa 100644 (file)
--- a/src/bin/e_policy_wl_display.c
+++ b/src/bin/e_policy_wl_display.c
@@ -249,17 +249,6 @@ _e_policy_wl_display_screen_mode_send(E_Display_Screen_Mode mode)
    eldbus_connection_send(_e_display_dbus_info.edbus_conn, msg, NULL, NULL, -1);
 }
 
-#undef E_CLIENT_HOOK_APPEND
-#define E_CLIENT_HOOK_APPEND(l, t, cb, d) \
-  do                                      \
-    {                                     \
-       E_Client_Hook *_h;                 \
-       _h = e_client_hook_add(t, cb, d);  \
-       assert(_h);                        \
-       l = eina_list_append(l, _h);       \
-    }                                     \
-  while (0)
-
 Eina_Bool
 e_policy_display_init(void)
 {

diff --git a/src/bin/services/e_service_cbhm.c b/src/bin/services/e_service_cbhm.c
index 742e2d4..4985131 100644 (file)
--- a/src/bin/services/e_service_cbhm.c
+++ b/src/bin/services/e_service_cbhm.c
@@ -146,17 +146,6 @@ _e_cbhm_vis_change(E_Policy_Cbhm *cbhm, Eina_Bool vis)
    EC_CHANGED(ec);
 }
 
-#undef E_CLIENT_HOOK_APPEND
-#define E_CLIENT_HOOK_APPEND(l, t, cb, d) \
-  do                                      \
-    {                                     \
-       E_Client_Hook *_h;                 \
-       _h = e_client_hook_add(t, cb, d);  \
-       assert(_h);                        \
-       l = eina_list_append(l, _h);       \
-    }                                     \
-  while (0)
-
 /* NOTE: supported single client for cbhm for now. */
 EINTERN void
 e_service_cbhm_client_set(E_Client *ec)

diff --git a/src/bin/services/e_service_quickpanel.c b/src/bin/services/e_service_quickpanel.c
index 4d85505..535297c 100644 (file)
--- a/src/bin/services/e_service_quickpanel.c
+++ b/src/bin/services/e_service_quickpanel.c
@@ -2192,17 +2192,6 @@ e_service_quickpanel_type_get(E_Client *ec)
    return type;
 }
 
-#undef E_CLIENT_HOOK_APPEND
-#define E_CLIENT_HOOK_APPEND(l, t, cb, d) \
-  do                                      \
-    {                                     \
-       E_Client_Hook *_h;                 \
-       _h = e_client_hook_add(t, cb, d);  \
-       assert(_h);                        \
-       l = eina_list_append(l, _h);       \
-    }                                     \
-  while (0)
-
 /* window for quickpanel service */
 EINTERN void
 e_service_quickpanel_client_add(E_Client *ec, E_Service_Quickpanel_Type type)