[PATCH weston 16/19] desktop-shell: Use the grabbed pointer in popup_grab_button

[Jonas Ådahl]

On Wed, Jun 03, 2015 at 03:53:35PM -0500, Derek Foreman wrote:
> This should be identical to the pointer in shset->seat.
> 
> A later patch prevents direct access to seat->pointer, using the
> known valid pointer in the grab will be nicer than using the
> getter functions that patch introduces.
> 
> Signed-off-by: Derek Foreman <derekf at osg.samsung.com>

Reviewed-by: Jonas Ådahl <jadahl at gmail.com>

> ---
>  desktop-shell/shell.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c
> index a431291..6643612 100644
> --- a/desktop-shell/shell.c
> +++ b/desktop-shell/shell.c
> @@ -3226,7 +3226,7 @@ popup_grab_button(struct weston_pointer_grab *grab,
>  		}
>  	} else if (state == WL_POINTER_BUTTON_STATE_RELEASED &&
>  		   (shseat->popup_grab.initial_up ||
> -		    time - shseat->seat->pointer->grab_time > 500)) {
> +		    time - grab->pointer->grab_time > 500)) {
>  		popup_grab_end(grab->pointer);
>  	}
>  
> -- 
> 2.1.4
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel