meta-agl-core/recipes-graphics/wayland/weston/0001-libweston-desktop-rename-weston_desktop_client_destr.patch

   1 From 5a6604a7a2e52e5cd84c1f53724b3f7c325b5dff Mon Sep 17 00:00:00 2001
   2 From: Pekka Paalanen <pekka.paalanen@collabora.com>
   3 Upstream-Status: Backport
   4 Date: Fri, 14 May 2021 15:54:56 +0300
   5 Subject: [PATCH] libweston-desktop: rename weston_desktop_client_destroy()
   6
   7 This function here is a wl_resource destructor, but we will need another
   8 function for externally triggered destroy when wl_resource does not
   9 exist.
  10
  11 Rename the existing function, because the old name fits better the new
  12 function to be written.
  13
  14 Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
  15 ---
  16  libweston-desktop/client.c | 9 ++++-----
  17  1 file changed, 4 insertions(+), 5 deletions(-)
  18
  19 diff --git a/libweston-desktop/client.c b/libweston-desktop/client.c
  20 index 56413f713..ba7bfbc46 100644
  21 --- a/libweston-desktop/client.c
  22 +++ b/libweston-desktop/client.c
  23 @@ -49,7 +49,7 @@ weston_desktop_client_add_destroy_listener(struct weston_desktop_client *client,
  24  }
  25
  26  static void
  27 -weston_desktop_client_destroy(struct wl_resource *resource)
  28 +weston_desktop_client_handle_destroy(struct wl_resource *resource)
  29  {
  30         struct weston_desktop_client *client =
  31                 wl_resource_get_user_data(resource);
  32 @@ -117,13 +117,12 @@ weston_desktop_client_create(struct weston_desktop *desktop,
  33
  34         if (dispatcher != NULL)
  35                 wl_resource_set_dispatcher(client->resource, dispatcher,
  36 -                                          weston_desktop_client_destroy, client,
  37 -                                          weston_desktop_client_destroy);
  38 +                                          weston_desktop_client_handle_destroy, client,
  39 +                                          weston_desktop_client_handle_destroy);
  40         else
  41                 wl_resource_set_implementation(client->resource, implementation,
  42                                                client,
  43 -                                              weston_desktop_client_destroy);
  44 -
  45 +                                              weston_desktop_client_handle_destroy);
  46
  47         display = wl_client_get_display(client->client);
  48         loop = wl_display_get_event_loop(display);
  49 --
  50 GitLab
  51