From 767d891c35f396cb90b298e0ae782ce80a0ad6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 3 Dec 2013 22:30:17 +0100 Subject: [PATCH] data-device: Fix surface configure function type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The commit "Remove the weston_view.geometry.width/height fields" changed the type of the surface configure callback function, but did not change the callbacks in data-device.c. This commit fixes the type of the functions left needed to be changed. Signed-off-by: Jonas Ådahl --- src/data-device.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/data-device.c b/src/data-device.c index 2af04de5..483e22e9 100644 --- a/src/data-device.c +++ b/src/data-device.c @@ -182,10 +182,10 @@ static struct wl_data_source_interface data_source_interface = { static void drag_surface_configure(struct weston_drag *drag, - struct weston_pointer *pointer, - struct weston_touch *touch, - struct weston_surface *es, int32_t sx, int32_t sy, - int32_t width, int32_t height) + struct weston_pointer *pointer, + struct weston_touch *touch, + struct weston_surface *es, + int32_t sx, int32_t sy) { struct wl_list *list; float fx, fy; @@ -222,25 +222,26 @@ drag_surface_configure(struct weston_drag *drag, } static void -pointer_drag_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height) +pointer_drag_surface_configure(struct weston_surface *es, + int32_t sx, int32_t sy) { struct weston_pointer_drag *drag = es->configure_private; struct weston_pointer *pointer = drag->grab.pointer; assert(es->configure == pointer_drag_surface_configure); - drag_surface_configure(&drag->base, pointer, NULL, es, sx, sy, width, height); + drag_surface_configure(&drag->base, pointer, NULL, es, sx, sy); } static void -touch_drag_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy, int32_t width, int32_t height) +touch_drag_surface_configure(struct weston_surface *es, int32_t sx, int32_t sy) { struct weston_touch_drag *drag = es->configure_private; struct weston_touch *touch = drag->grab.touch; assert(es->configure == touch_drag_surface_configure); - drag_surface_configure(&drag->base, NULL, touch, es, sx, sy, width, height); + drag_surface_configure(&drag->base, NULL, touch, es, sx, sy); } static void