xdg-{toplevel,popup}: extract destructors

include/types/wlr_xdg_shell.h

@@ -31,11 +31,13 @@ void create_xdg_popup(struct wlr_xdg_surface *surface,
 	struct wlr_xdg_surface *parent,
 	struct wlr_xdg_positioner_resource *positioner, uint32_t id);
 void unmap_xdg_popup(struct wlr_xdg_popup *popup);
+void destroy_xdg_popup(struct wlr_xdg_popup *popup);
 void handle_xdg_popup_committed(struct wlr_xdg_popup *popup);
 
 void create_xdg_toplevel(struct wlr_xdg_surface *surface,
 	uint32_t id);
 void unmap_xdg_toplevel(struct wlr_xdg_toplevel *toplevel);
+void destroy_xdg_toplevel(struct wlr_xdg_toplevel *toplevel);
 void handle_xdg_toplevel_committed(struct wlr_xdg_toplevel *toplevel);
 struct wlr_xdg_toplevel_configure *send_xdg_toplevel_configure(
 	struct wlr_xdg_toplevel *toplevel);

types/xdg_shell/wlr_xdg_popup.c

@@ -389,6 +389,12 @@ void unmap_xdg_popup(struct wlr_xdg_popup *popup) {
 	}
 }
 
+void destroy_xdg_popup(struct wlr_xdg_popup *popup) {
+	wl_list_remove(&popup->link);
+	wl_resource_set_user_data(popup->resource, NULL);
+	free(popup);
+}
+
 void wlr_xdg_popup_destroy(struct wlr_xdg_popup *popup) {
 	if (popup == NULL) {
 		return;

types/xdg_shell/wlr_xdg_surface.c

@@ -411,15 +411,11 @@ void reset_xdg_surface(struct wlr_xdg_surface *surface) {
 
 	switch (surface->role) {
 	case WLR_XDG_SURFACE_ROLE_TOPLEVEL:
-		wl_resource_set_user_data(surface->toplevel->resource, NULL);
+		destroy_xdg_toplevel(surface->toplevel);
-		free(surface->toplevel);
 		surface->toplevel = NULL;
 		break;
 	case WLR_XDG_SURFACE_ROLE_POPUP:
-		wl_list_remove(&surface->popup->link);
+		destroy_xdg_popup(surface->popup);
-
-		wl_resource_set_user_data(surface->popup->resource, NULL);
-		free(surface->popup);
 		surface->popup = NULL;
 		break;
 	case WLR_XDG_SURFACE_ROLE_NONE:

types/xdg_shell/wlr_xdg_toplevel.c

@@ -493,6 +493,11 @@ void unmap_xdg_toplevel(struct wlr_xdg_toplevel *toplevel) {
 	toplevel->requested.minimized = false;
 }
 
+void destroy_xdg_toplevel(struct wlr_xdg_toplevel *toplevel) {
+	wl_resource_set_user_data(toplevel->resource, NULL);
+	free(toplevel);
+}
+
 void wlr_xdg_toplevel_send_close(struct wlr_xdg_toplevel *toplevel) {
 	xdg_toplevel_send_close(toplevel->resource);
 }