From 1973072df8cb310e97199ee9694c88a918da228f Mon Sep 17 00:00:00 2001 From: devilhorns Date: Mon, 8 Aug 2011 20:10:44 +0000 Subject: [PATCH] Ecore_X: Fix fat finger copy-paste error wrt casting on shape rectangles. Thanks jeffdameth for pointing that out ;) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@62215 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_x/xcb/ecore_xcb_window_shape.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c b/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c index 58e3370..2c04fb2 100644 --- a/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c +++ b/src/lib/ecore_x/xcb/ecore_xcb_window_shape.c @@ -142,7 +142,7 @@ ecore_x_window_shape_rectangles_set(Ecore_X_Window win, Ecore_X_Rectangle *rects } xcb_shape_rectangles(_ecore_xcb_conn, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_BOUNDING, XCB_CLIP_ORDERING_UNSORTED, - win, 0, 0, num, (xcb_rectangle_t *)&rect); + win, 0, 0, num, (xcb_rectangle_t *)rect); if (rect) free(rect); #else @@ -475,7 +475,7 @@ ecore_x_window_shape_input_rectangles_set(Ecore_X_Window win, Ecore_X_Rectangle } xcb_shape_rectangles(_ecore_xcb_conn, XCB_SHAPE_SO_SET, XCB_SHAPE_SK_INPUT, XCB_CLIP_ORDERING_UNSORTED, - win, 0, 0, num, (xcb_rectangle_t *)&rect); + win, 0, 0, num, (xcb_rectangle_t *)rect); if (rect) free(rect); #else @@ -543,11 +543,13 @@ ecore_x_window_shape_input_rectangle_add(Ecore_X_Window win, int x, int y, int w EAPI void ecore_x_window_shape_input_rectangle_set(Ecore_X_Window win, int x, int y, int w, int h) { - LOGFN(__FILE__, __LINE__, __FUNCTION__); - #ifdef ECORE_XCB_SHAPE xcb_rectangle_t rect; +#endif + + LOGFN(__FILE__, __LINE__, __FUNCTION__); +#ifdef ECORE_XCB_SHAPE rect.x = x; rect.y = y; rect.width = w; -- 2.7.4