From 49d77d20ae17e1ee8ca462997b3f73a58eceb57f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Wed, 18 Mar 2015 16:20:51 +0800
Subject: xdg-shell: Require proper object tree destruction
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Require all child objects to be destroyed before the parent. In other
words, all popups and surfaces created by one xdg_shell instance needs
to be destroyed before the xdg_shell object, otherwise a protocol error
is raised.

Signed-off-by: Jonas Ådahl <jadahl@gmail.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
---
 protocol/xdg-shell.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'protocol')

diff --git a/protocol/xdg-shell.xml b/protocol/xdg-shell.xml
index 68cf4699..866e3300 100644
--- a/protocol/xdg-shell.xml
+++ b/protocol/xdg-shell.xml
@@ -49,6 +49,7 @@
 
     <enum name="error">
       <entry name="role" value="0" summary="given wl_surface has another role"/>
+      <entry name="defunct_surfaces" value="1" summary="xdg_shell was destroyed before children"/>
     </enum>
 
     <request name="destroy" type="destructor">
@@ -56,9 +57,8 @@
         Destroy this xdg_shell object.
 
         Destroying a bound xdg_shell object while there are surfaces
-        still alive with roles from this interface is illegal and will
-        result in a protocol error. Make sure to destroy all surfaces
-        before destroying this object.
+        still alive created by this xdg_shell object instance is illegal
+        and will result in a protocol error.
       </description>
     </request>
 
-- 
cgit v1.2.1