[PATCH weston 4/8] westoy: Remove some accessors for wl_shell / wl_shell_surface

[Kristian Høgsberg]

On Tue, Nov 12, 2013 at 08:20:00PM -0500, Jasper St. Pierre wrote:
> We want to remove support for these deprecated interfaces. Since
> nothing is using them, this is a simple change.

Applied, thanks.
Kristian

> ---
>  clients/window.c | 12 ------------
>  clients/window.h |  6 ------
>  2 files changed, 18 deletions(-)
> 
> diff --git a/clients/window.c b/clients/window.c
> index 0e5fce2..29ca42d 100644
> --- a/clients/window.c
> +++ b/clients/window.c
> @@ -1938,12 +1938,6 @@ window_get_wl_surface(struct window *window)
>  	return window->main_surface->surface;
>  }
>  
> -struct wl_shell_surface *
> -window_get_wl_shell_surface(struct window *window)
> -{
> -	return window->shell_surface;
> -}
> -
>  static void
>  tooltip_redraw_handler(struct widget *widget, void *data)
>  {
> @@ -5224,12 +5218,6 @@ display_get_argb_egl_config(struct display *d)
>  	return d->argb_config;
>  }
>  
> -struct wl_shell *
> -display_get_shell(struct display *display)
> -{
> -	return display->shell;
> -}
> -
>  int
>  display_acquire_window_surface(struct display *display,
>  			       struct window *window,
> diff --git a/clients/window.h b/clients/window.h
> index d5e40ed..838ea4e 100644
> --- a/clients/window.h
> +++ b/clients/window.h
> @@ -87,9 +87,6 @@ display_get_cairo_device(struct display *display);
>  struct wl_compositor *
>  display_get_compositor(struct display *display);
>  
> -struct wl_shell *
> -display_get_shell(struct display *display);
> -
>  struct output *
>  display_get_output(struct display *display);
>  
> @@ -349,9 +346,6 @@ window_get_surface(struct window *window);
>  struct wl_surface *
>  window_get_wl_surface(struct window *window);
>  
> -struct wl_shell_surface *
> -window_get_wl_shell_surface(struct window *window);
> -
>  enum window_buffer_type {
>  	WINDOW_BUFFER_TYPE_EGL_WINDOW,
>  	WINDOW_BUFFER_TYPE_SHM,
> -- 
> 1.8.4.2
> 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel