From e8447ad9bb034a859507862cef74e53a41cfafa8 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 11 Apr 2014 22:55:20 -0700
Subject: [PATCH] wayland: Rename the delete event to the close event

This was changed upstream a little while ago for C++ compatibility.

It's also the more common term for the operation: you close a window,
you don't delete one. In fact, a delete event might seem like it
would be about resource management instead.
---
 src/wayland/meta-wayland-surface.c | 2 +-
 src/wayland/protocol/xdg-shell.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index a9aae3540..2a2830fe0 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -1819,7 +1819,7 @@ void
 meta_wayland_surface_delete (MetaWaylandSurface *surface)
 {
   if (surface->xdg_surface.resource)
-    xdg_surface_send_delete (surface->xdg_surface.resource);
+    xdg_surface_send_close (surface->xdg_surface.resource);
 }
 
 void
diff --git a/src/wayland/protocol/xdg-shell.xml b/src/wayland/protocol/xdg-shell.xml
index a2913c4c0..79a283173 100644
--- a/src/wayland/protocol/xdg-shell.xml
+++ b/src/wayland/protocol/xdg-shell.xml
@@ -384,9 +384,9 @@
       </description>
     </event>
 
-    <event name="delete">
+    <event name="close">
       <description summary="surface wants to be closed">
-        The delete event is sent by the compositor when the user
+        The close event is sent by the compositor when the user
         wants the surface to be closed. This should be equivalent to
         the user clicking the close button in client-side decorations,
         if your application has any...