From: Jonas Ådahl <jadahl@gmail.com>
Date: Tue, 3 Dec 2013 21:30:17 +0000 (+0100)
Subject: data-device: Fix surface configure function type
X-Git-Tag: upstream/0.1.8~639
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=767d891c35f396cb90b298e0ae782ce80a0ad6c8;p=profile%2Fivi%2Fweston-ivi-shell.git

data-device: Fix surface configure function type

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 <jadahl@gmail.com>
---

diff --git a/src/data-device.c b/src/data-device.c
index 2af04de..483e22e 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