From e980fbf83d46437224465fbb29bbc8f95bae5a58 Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Mon, 14 Jan 2019 09:58:19 +0100
Subject: [PATCH] libs: wayland: Prefix wl_shell field with `wl_`

It will help us to distinguish from other Wayland shells (such as
XDG-shell) later on.
---
 gst-libs/gst/vaapi/gstvaapidisplay_wayland.c      | 8 ++++----
 gst-libs/gst/vaapi/gstvaapidisplay_wayland_priv.h | 2 +-
 gst-libs/gst/vaapi/gstvaapiwindow_wayland.c       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c b/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c
index 6147cbab23..9c40c90a7e 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_wayland.c
@@ -105,7 +105,7 @@ registry_handle_global (void *data,
     priv->compositor =
         wl_registry_bind (registry, id, &wl_compositor_interface, 1);
   else if (strcmp (interface, "wl_shell") == 0)
-    priv->shell = wl_registry_bind (registry, id, &wl_shell_interface, 1);
+    priv->wl_shell = wl_registry_bind (registry, id, &wl_shell_interface, 1);
   else if (strcmp (interface, "wl_output") == 0) {
     priv->output = wl_registry_bind (registry, id, &wl_output_interface, 1);
     wl_output_add_listener (priv->output, &output_listener, priv);
@@ -142,8 +142,8 @@ gst_vaapi_display_wayland_setup (GstVaapiDisplay * display)
     return FALSE;
   }
 
-  if (!priv->shell) {
-    GST_ERROR ("failed to bind shell interface");
+  if (!priv->wl_shell) {
+    GST_ERROR ("failed to bind wl_shell interface");
     return FALSE;
   }
   return TRUE;
@@ -191,7 +191,7 @@ gst_vaapi_display_wayland_close_display (GstVaapiDisplay * display)
       GST_VAAPI_DISPLAY_WAYLAND_GET_PRIVATE (display);
 
   g_clear_pointer (&priv->output, wl_output_destroy);
-  g_clear_pointer (&priv->shell, wl_shell_destroy);
+  g_clear_pointer (&priv->wl_shell, wl_shell_destroy);
   g_clear_pointer (&priv->compositor, wl_compositor_destroy);
   g_clear_pointer (&priv->registry, wl_registry_destroy);
 
diff --git a/gst-libs/gst/vaapi/gstvaapidisplay_wayland_priv.h b/gst-libs/gst/vaapi/gstvaapidisplay_wayland_priv.h
index bf6e81c639..54bf9b1c04 100644
--- a/gst-libs/gst/vaapi/gstvaapidisplay_wayland_priv.h
+++ b/gst-libs/gst/vaapi/gstvaapidisplay_wayland_priv.h
@@ -60,7 +60,7 @@ struct _GstVaapiDisplayWaylandPrivate
   gchar *display_name;
   struct wl_display *wl_display;
   struct wl_compositor *compositor;
-  struct wl_shell *shell;
+  struct wl_shell *wl_shell;
   struct wl_output *output;
   struct wl_registry *registry;
   guint width;
diff --git a/gst-libs/gst/vaapi/gstvaapiwindow_wayland.c b/gst-libs/gst/vaapi/gstvaapiwindow_wayland.c
index 5b9b4663c0..0baa17cdca 100644
--- a/gst-libs/gst/vaapi/gstvaapiwindow_wayland.c
+++ b/gst-libs/gst/vaapi/gstvaapiwindow_wayland.c
@@ -270,7 +270,7 @@ gst_vaapi_window_wayland_create (GstVaapiWindow * window,
   GST_DEBUG ("create window, size %ux%u", *width, *height);
 
   g_return_val_if_fail (priv_display->compositor != NULL, FALSE);
-  g_return_val_if_fail (priv_display->shell != NULL, FALSE);
+  g_return_val_if_fail (priv_display->wl_shell != NULL, FALSE);
 
   GST_VAAPI_WINDOW_LOCK_DISPLAY (window);
   priv->event_queue = wl_display_create_queue (priv_display->wl_display);
@@ -287,7 +287,7 @@ gst_vaapi_window_wayland_create (GstVaapiWindow * window,
 
   GST_VAAPI_WINDOW_LOCK_DISPLAY (window);
   priv->shell_surface =
-      wl_shell_get_shell_surface (priv_display->shell, priv->surface);
+      wl_shell_get_shell_surface (priv_display->wl_shell, priv->surface);
   GST_VAAPI_WINDOW_UNLOCK_DISPLAY (window);
   if (!priv->shell_surface)
     return FALSE;