From 62e45b6d5ee5854e55983961cb47774465725864 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Sun, 16 Mar 2014 16:50:38 +0100 Subject: [PATCH] wayland-pointer: Drop unused arg from focus grab interface method https://bugzilla.gnome.org/show_bug.cgi?id=726123 --- src/wayland/meta-wayland-data-device.c | 5 ++--- src/wayland/meta-wayland-pointer.c | 12 +++++------- src/wayland/meta-wayland-pointer.h | 3 +-- src/wayland/meta-wayland-seat.c | 3 +-- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/wayland/meta-wayland-data-device.c b/src/wayland/meta-wayland-data-device.c index fe7b237ab..c45476112 100644 --- a/src/wayland/meta-wayland-data-device.c +++ b/src/wayland/meta-wayland-data-device.c @@ -175,8 +175,7 @@ destroy_drag_focus (struct wl_listener *listener, void *data) static void drag_grab_focus (MetaWaylandPointerGrab *grab, - MetaWaylandSurface *surface, - const ClutterEvent *event) + MetaWaylandSurface *surface) { MetaWaylandDragGrab *drag_grab = (MetaWaylandDragGrab*) grab; MetaWaylandSeat *seat = drag_grab->seat; @@ -257,7 +256,7 @@ data_device_end_drag_grab (MetaWaylandDragGrab *drag_grab) if (drag_grab->drag_data_source) wl_list_remove (&drag_grab->drag_data_source_listener.link); - drag_grab_focus (&drag_grab->generic, NULL, NULL); + drag_grab_focus (&drag_grab->generic, NULL); meta_wayland_pointer_end_grab (drag_grab->generic.pointer); g_slice_free (MetaWaylandDragGrab, drag_grab); diff --git a/src/wayland/meta-wayland-pointer.c b/src/wayland/meta-wayland-pointer.c index 07bd3620f..336cea023 100644 --- a/src/wayland/meta-wayland-pointer.c +++ b/src/wayland/meta-wayland-pointer.c @@ -78,8 +78,7 @@ pointer_handle_focus_resource_destroy (struct wl_listener *listener, void *data) static void default_grab_focus (MetaWaylandPointerGrab *grab, - MetaWaylandSurface *surface, - const ClutterEvent *event) + MetaWaylandSurface *surface) { MetaWaylandPointer *pointer = grab->pointer; @@ -385,7 +384,7 @@ meta_wayland_pointer_start_grab (MetaWaylandPointer *pointer, grab->pointer = pointer; if (pointer->current) - interface->focus (pointer->grab, pointer->current, NULL); + interface->focus (pointer->grab, pointer->current); } void @@ -395,7 +394,7 @@ meta_wayland_pointer_end_grab (MetaWaylandPointer *pointer) pointer->grab = &pointer->default_grab; interface = pointer->grab->interface; - interface->focus (pointer->grab, pointer->current, NULL); + interface->focus (pointer->grab, pointer->current); } typedef struct { @@ -415,15 +414,14 @@ typedef struct { static void popup_grab_focus (MetaWaylandPointerGrab *grab, - MetaWaylandSurface *surface, - const ClutterEvent *event) + MetaWaylandSurface *surface) { MetaWaylandPopupGrab *popup_grab = (MetaWaylandPopupGrab*)grab; /* Popup grabs are in owner-events mode (ie, events for the same client are reported as normal) */ if (surface && wl_resource_get_client (surface->resource) == popup_grab->grab_client) - default_grab_focus (grab, surface, event); + default_grab_focus (grab, surface); else meta_wayland_pointer_set_focus (grab->pointer, NULL); } diff --git a/src/wayland/meta-wayland-pointer.h b/src/wayland/meta-wayland-pointer.h index 08b6988e8..5eb6756e9 100644 --- a/src/wayland/meta-wayland-pointer.h +++ b/src/wayland/meta-wayland-pointer.h @@ -29,8 +29,7 @@ struct _MetaWaylandPointerGrabInterface { void (*focus) (MetaWaylandPointerGrab *grab, - MetaWaylandSurface *surface, - const ClutterEvent *event); + MetaWaylandSurface *surface); void (*motion) (MetaWaylandPointerGrab *grab, const ClutterEvent *event); void (*button) (MetaWaylandPointerGrab *grab, diff --git a/src/wayland/meta-wayland-seat.c b/src/wayland/meta-wayland-seat.c index 2f4658727..ed2ef55be 100644 --- a/src/wayland/meta-wayland-seat.c +++ b/src/wayland/meta-wayland-seat.c @@ -440,8 +440,7 @@ meta_wayland_seat_repick (MetaWaylandSeat *seat, { const MetaWaylandPointerGrabInterface *interface = pointer->grab->interface; - interface->focus (pointer->grab, - surface, for_event); + interface->focus (pointer->grab, surface); } }