Switch to wlr_xdg_surface_for_each_popup_surface

Instead of calling wlr_xdg_surface_for_each_popup and then
wlr_surface_for_each_surface, use the new for_each_popup_surface helper
introduced in [1] that does it in one go.

[1]: https://github.com/swaywm/wlroots/pull/2609

1 files changed, 4 insertions, 3 deletions

diff --git a/sway/desktop/xdg_shell.c b/sway/desktop/xdg_shell.c
index fdac6171..667fb9e5 100644
--- a/sway/desktop/xdg_shell.c
+++ b/sway/desktop/xdg_shell.c
@@ -211,12 +211,13 @@ static void for_each_surface(struct sway_view *view,
                 user_data);
 }
 
-static void for_each_popup(struct sway_view *view,
+static void for_each_popup_surface(struct sway_view *view,
                 wlr_surface_iterator_func_t iterator, void *user_data) {
         if (xdg_shell_view_from_view(view) == NULL) {
                 return;
         }
-        wlr_xdg_surface_for_each_popup(view->wlr_xdg_surface, iterator, user_data);
+        wlr_xdg_surface_for_each_popup_surface(view->wlr_xdg_surface, iterator,
+                user_data);
 }
 
 static bool is_transient_for(struct sway_view *child,
@@ -271,7 +272,7 @@ static const struct sway_view_impl view_impl = {
         .set_resizing = set_resizing,
         .wants_floating = wants_floating,
         .for_each_surface = for_each_surface,
-        .for_each_popup = for_each_popup,
+        .for_each_popup_surface = for_each_popup_surface,
         .is_transient_for = is_transient_for,
         .close = _close,
         .close_popups = close_popups,