From f4fc498e65f12e2b9fe01611f9e51e38eac60682 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Tue, 19 Nov 2013 23:33:46 -0500
Subject: [PATCH] wayland-surface: Properly destroy extension resources on the
 destroy request

Otherwise, the resource IDs will linger around and be destroyed again
on client close...
---
 src/wayland/meta-wayland-surface.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c
index f208da880..3d4b8f85b 100644
--- a/src/wayland/meta-wayland-surface.c
+++ b/src/wayland/meta-wayland-surface.c
@@ -518,7 +518,7 @@ static void
 xdg_surface_destroy (struct wl_client *client,
                      struct wl_resource *resource)
 {
-  destroy_surface_extension (resource);
+  wl_resource_destroy (resource);
 }
 
 static void
@@ -756,7 +756,7 @@ static void
 xdg_popup_destroy (struct wl_client *client,
                    struct wl_resource *resource)
 {
-  destroy_surface_extension (resource);
+  wl_resource_destroy (resource);
 }
 
 static void