Merge branch 'wlroots' into view-redesign

1 files changed, 2 insertions, 2 deletions

diff --git a/sway/tree/view.c b/sway/tree/view.c
index 8f044621..09c804e4 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -139,7 +139,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
 	}
 
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	struct sway_container *focus = sway_seat_get_focus_inactive(seat,
+	struct sway_container *focus = seat_get_focus_inactive(seat,
 		&root_container);
 	struct sway_container *cont = container_view_create(focus, view);
 
@@ -147,7 +147,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
 	view->swayc = cont;
 
 	arrange_windows(cont->parent, -1, -1);
-	sway_input_manager_set_focus(input_manager, cont);
+	input_manager_set_focus(input_manager, cont);
 
 	view_damage_whole(view);
 	view_update_outputs(view, NULL);