Merge branch 'gbsneto/fix-wayland-export-handle' into 'master'

wayland/surface: Only call destroy func when available

Closes #2179

See merge request GNOME/gtk!1112
This commit is contained in:
Georges Basile Stavracas Neto 2019-10-01 15:22:22 +00:00
commit 3afc7b0883

View File

@ -4063,8 +4063,11 @@ xdg_exported_handle (void *data,
GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
impl->exported.callback (surface, handle, impl->exported.user_data);
g_clear_pointer (&impl->exported.user_data,
impl->exported.destroy_func);
if (impl->exported.destroy_func)
{
g_clear_pointer (&impl->exported.user_data,
impl->exported.destroy_func);
}
}
static const struct zxdg_exported_v1_listener xdg_exported_listener = {