[gtk+/gtk-3-22] GdkWaylandWindow: Unexport when finalizing

[Matthias Clasen <matthiasc src gnome org>]

commit ab4e4bd3aec6aeb3df6de16bd12d7f538de39061
Author: Jonas Ådahl <jadahl gmail com>
Date:   Mon May 8 12:09:00 2017 +0800

    GdkWaylandWindow: Unexport when finalizing
    
    The application might not have exported, and it'll be too late for it
    at this point anyway, so lets be helpful and not leak it.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782109

 gdk/wayland/gdkwindow-wayland.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
---
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 191ab21..f36f9b2 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -239,6 +239,8 @@ static void calculate_moved_to_rect_result (GdkWindow    *window,
                                             gboolean     *flipped_x,
                                             gboolean     *flipped_y);
 
+static gboolean gdk_wayland_window_is_exported (GdkWindow *window);
+
 GType _gdk_window_impl_wayland_get_type (void);
 
 G_DEFINE_TYPE (GdkWindowImplWayland, _gdk_window_impl_wayland, GDK_TYPE_WINDOW_IMPL)
@@ -969,6 +971,9 @@ gdk_window_impl_wayland_finalize (GObject *object)
 
   impl = GDK_WINDOW_IMPL_WAYLAND (object);
 
+  if (gdk_wayland_window_is_exported (window))
+    gdk_wayland_window_unexport_handle (window);
+
   g_free (impl->title);
 
   g_free (impl->application.application_id);
@@ -4049,6 +4054,12 @@ static const struct zxdg_exported_v1_listener xdg_exported_listener = {
  * Since: 3.22
  */
 
+static gboolean
+gdk_wayland_window_is_exported (GdkWindow *window)
+{
+  return !!impl->display_server.xdg_exported;
+}
+
 /**
  * gdk_wayland_window_export_handle:
  * @window: the #GdkWindow to obtain a handle for