On Tue, Dec 03, 2013 at 10:30:17PM +0100, Jonas Ådahl wrote: > 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.
Argh, I let that slip through. Thanks for catching it, Jonas. Kristian > Signed-off-by: Jonas Ådahl <[email protected]> > --- > 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 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 > -- > 1.8.1.2 > > _______________________________________________ > wayland-devel mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/wayland-devel _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
