discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=75c9d9babdf9978339fb24e2a0b4acb2361ebf0d
commit 75c9d9babdf9978339fb24e2a0b4acb2361ebf0d Author: Mike Blumenkrantz <[email protected]> Date: Wed Mar 18 16:28:24 2015 -0400 remove E_Comp from e_resist apis --- src/bin/e_client.c | 4 ++-- src/bin/e_resist.c | 6 +++--- src/bin/e_resist.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/bin/e_client.c b/src/bin/e_client.c index e24c5bc..fc945e6 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -954,7 +954,7 @@ _e_client_resize_handle(E_Client *ec) y += (th - h); skiplist = eina_list_append(skiplist, ec); - e_resist_client_position(e_comp, skiplist, + e_resist_client_position(skiplist, ec->x, ec->y, ec->w, ec->h, x, y, w, h, &new_x, &new_y, &new_w, &new_h); @@ -2876,7 +2876,7 @@ e_client_mouse_move(E_Client *ec, Evas_Point *output) e_comp_object_frame_xy_adjust(ec->frame, x, y, &new_x, &new_y); skiplist = eina_list_append(skiplist, ec); - e_resist_client_position(e_comp, skiplist, + e_resist_client_position(skiplist, ec->x, ec->y, ec->w, ec->h, x, y, ec->w, ec->h, &new_x, &new_y, &new_w, &new_h); diff --git a/src/bin/e_resist.c b/src/bin/e_resist.c index ebcabc4..8b94823 100644 --- a/src/bin/e_resist.c +++ b/src/bin/e_resist.c @@ -12,7 +12,7 @@ struct _E_Resist_Rect static void _e_resist_rects(Eina_List *rects, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh); EAPI int -e_resist_client_position(E_Comp *c, Eina_List *skiplist, +e_resist_client_position(Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh) @@ -49,7 +49,7 @@ e_resist_client_position(E_Comp *c, Eina_List *skiplist, rects = eina_list_append(rects, r); \ } - EINA_LIST_FOREACH(c->zones, l, zone) + EINA_LIST_FOREACH(e_comp->zones, l, zone) { HOLDER(zone->x, zone->y, zone->w, zone->h, e_config->desk_resist); } @@ -88,7 +88,7 @@ e_resist_client_position(E_Comp *c, Eina_List *skiplist, } EAPI int -e_resist_gadman_position(E_Comp *c EINA_UNUSED, Eina_List *skiplist __UNUSED__, +e_resist_gadman_position(Eina_List *skiplist __UNUSED__, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry) diff --git a/src/bin/e_resist.h b/src/bin/e_resist.h index c61b7d3..e4a4272 100644 --- a/src/bin/e_resist.h +++ b/src/bin/e_resist.h @@ -3,8 +3,8 @@ #ifndef E_RESIST_H #define E_RESIST_H -EAPI int e_resist_client_position(E_Comp *c, Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh); -EAPI int e_resist_gadman_position(E_Comp *c, Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry); +EAPI int e_resist_client_position(Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry, int *rw, int *rh); +EAPI int e_resist_gadman_position(Eina_List *skiplist, int px, int py, int pw, int ph, int x, int y, int w, int h, int *rx, int *ry); #endif #endif --
