[PATCH 2/2] xwayland/window-manager.c: Remove unnecessary arg from weston_wm_activate().

[Kristian Høgsberg]

On Mon, May 21, 2012 at 03:49:14PM -0600, Scott Moreau wrote:

If this function operates on a weston_wm_window, it should be called
weston_wm_window_activate().  But we already have that, so I just
folded it into that.

Kristian

> ---
>  src/xwayland/window-manager.c |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/src/xwayland/window-manager.c b/src/xwayland/window-manager.c
> index b64a6e5..e38f64b 100644
> --- a/src/xwayland/window-manager.c
> +++ b/src/xwayland/window-manager.c
> @@ -428,9 +428,10 @@ weston_wm_handle_configure_notify(struct weston_wm *wm, xcb_generic_event_t *eve
>  }
>  
>  static void
> -weston_wm_activate(struct weston_wm *wm,
> -		 struct weston_wm_window *window, xcb_timestamp_t time)
> +weston_wm_activate(struct weston_wm_window *window, xcb_timestamp_t time)
>  {
> +	struct weston_wm *wm = window->wm;
> +
>  	xcb_client_message_event_t client_message;
>  
>  	client_message.response_type = XCB_CLIENT_MESSAGE;
> @@ -459,7 +460,7 @@ weston_wm_window_activate(struct wl_listener *listener, void *data)
>  	struct weston_wm *wm = container_of(listener, struct weston_wm, activate_listener);
>  
>  	if (window)
> -		weston_wm_activate(wm, window, XCB_TIME_CURRENT_TIME);
> +		weston_wm_activate(window, XCB_TIME_CURRENT_TIME);
>  	else
>  		xcb_set_input_focus (wm->conn,
>  				     XCB_INPUT_FOCUS_POINTER_ROOT,
> -- 
> 1.7.7.6
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel