summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-06-22 14:10:54 +0200
committerJørgen Lind <jorgen.lind@nokia.com>2012-06-22 14:14:27 +0200
commit1159a73f374022a2d94fc20372eaed0b6af3d8ed (patch)
tree3e26fb17a59df433d6135e1825eae96189b15597
parent13268e48687eae401720baa8148c9058f2931ab6 (diff)
Destroy shell surfaces on client side
Otherwise we get the usual delete_id for live object warnings with Weston. Change-Id: I4c24cec6522ea9f501495d4f5e29f9725976f202 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
-rw-r--r--src/plugins/platforms/wayland/qwaylandshellsurface.cpp5
-rw-r--r--src/plugins/platforms/wayland/qwaylandshellsurface.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp b/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
index 05e415bae..e443e7763 100644
--- a/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
+++ b/src/plugins/platforms/wayland/qwaylandshellsurface.cpp
@@ -55,6 +55,11 @@ QWaylandShellSurface::QWaylandShellSurface(struct wl_shell_surface *shell_surfac
wl_shell_surface_add_listener(m_shell_surface,&m_shell_surface_listener,this);
}
+QWaylandShellSurface::~QWaylandShellSurface()
+{
+ wl_shell_surface_destroy(m_shell_surface);
+}
+
void QWaylandShellSurface::resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges)
{
wl_shell_surface_resize(m_shell_surface,inputDevice->wl_seat(),
diff --git a/src/plugins/platforms/wayland/qwaylandshellsurface.h b/src/plugins/platforms/wayland/qwaylandshellsurface.h
index 143877366..f284e5a5e 100644
--- a/src/plugins/platforms/wayland/qwaylandshellsurface.h
+++ b/src/plugins/platforms/wayland/qwaylandshellsurface.h
@@ -54,6 +54,7 @@ class QWaylandShellSurface
{
public:
QWaylandShellSurface(struct wl_shell_surface *shell_surface, QWaylandWindow *window);
+ ~QWaylandShellSurface();
void resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges);
void move(QWaylandInputDevice *inputDevice);