chase: move xdg destroy signal to toplevel / popup

https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4345

diff --git a/src/layers.c b/src/layers.c
index df556761b26d1103df59ace4cfd9255fd4f01a3f..849e8d34dcaeec88e8eab01fe94147f5f7fa749c 100644 (file)
--- a/src/layers.c
+++ b/src/layers.c
@@ -412,7 +412,7 @@ create_popup(struct wlr_xdg_popup *wlr_popup, struct wlr_scene_tree *parent)
                LAB_NODE_DESC_LAYER_POPUP, popup);
 
        popup->destroy.notify = popup_handle_destroy;
-       wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
+       wl_signal_add(&wlr_popup->events.destroy, &popup->destroy);
 
        popup->new_popup.notify = popup_handle_new_popup;
        wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);

diff --git a/src/xdg-popup.c b/src/xdg-popup.c
index d6bc99f0b3557bec2e04191e91bc54f134b4d52c..c17d195a9a13986061b81c4d563f157af4ff7bde 100644 (file)
--- a/src/xdg-popup.c
+++ b/src/xdg-popup.c
@@ -101,7 +101,7 @@ xdg_popup_create(struct view *view, struct wlr_xdg_popup *wlr_popup)
        popup->wlr_popup = wlr_popup;
 
        popup->destroy.notify = handle_xdg_popup_destroy;
-       wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
+       wl_signal_add(&wlr_popup->events.destroy, &popup->destroy);
 
        popup->new_popup.notify = popup_handle_new_xdg_popup;
        wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);

diff --git a/src/xdg.c b/src/xdg.c
index a24de0a8a4c0637b3fafc070107c10a6d6173715..16474e8f9bf69aa7650a6f7e30660d662132a8a7 100644 (file)
--- a/src/xdg.c
+++ b/src/xdg.c
@@ -824,9 +824,9 @@ xdg_surface_new(struct wl_listener *listener, void *data)
        xdg_surface->surface->data = tree;
 
        view_connect_map(view, xdg_surface->surface);
-       CONNECT_SIGNAL(xdg_surface, view, destroy);
 
        struct wlr_xdg_toplevel *toplevel = xdg_surface->toplevel;
+       CONNECT_SIGNAL(toplevel, view, destroy);
        CONNECT_SIGNAL(toplevel, view, request_move);
        CONNECT_SIGNAL(toplevel, view, request_resize);
        CONNECT_SIGNAL(toplevel, view, request_minimize);

diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index 549c6ca7c7cd2d0d16283a0b01cf66c4f9b2aecf..7434fb1f40ffc838989df00f4a9f3a37081ea5da 100644 (file)
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = d61ec694b352c0f21c06958c5ef0417f3e424e3c
+revision = c85838892d56111809aa2edb83a2f22428bfa806
 
 [provide]
 dependency_names = wlroots