Merge pull request #1653 from swaywm/revert-1647-refactor-tree

Revert "Refactor tree"

1 files changed, 6 insertions, 6 deletions

diff --git a/sway/desktop/wl_shell.c b/sway/desktop/wl_shell.c
index 4d4d1ed7..0356aa81 100644
--- a/sway/desktop/wl_shell.c
+++ b/sway/desktop/wl_shell.c
@@ -3,10 +3,10 @@
 #include <stdlib.h>
 #include <wayland-server.h>
 #include <wlr/types/wlr_wl_shell.h>
-#include "sway/tree/container.h"
-#include "sway/tree/layout.h"
+#include "sway/container.h"
+#include "sway/layout.h"
 #include "sway/server.h"
-#include "sway/tree/view.h"
+#include "sway/view.h"
 #include "sway/input/seat.h"
 #include "sway/input/input-manager.h"
 #include "log.h"
@@ -74,7 +74,7 @@ static void handle_destroy(struct wl_listener *listener, void *data) {
 		wl_container_of(listener, sway_surface, destroy);
 	wl_list_remove(&sway_surface->commit.link);
 	wl_list_remove(&sway_surface->destroy.link);
-	struct sway_container *parent = container_view_destroy(sway_surface->view->swayc);
+	swayc_t *parent = destroy_view(sway_surface->view->swayc);
 	free(sway_surface->view);
 	free(sway_surface);
 	arrange_windows(parent, -1, -1);
@@ -132,8 +132,8 @@ void handle_wl_shell_surface(struct wl_listener *listener, void *data) {
 	wl_signal_add(&shell_surface->events.destroy, &sway_surface->destroy);
 
 	struct sway_seat *seat = input_manager_current_seat(input_manager);
-	struct sway_container *focus = sway_seat_get_focus_inactive(seat, &root_container);
-	struct sway_container *cont = container_view_create(focus, sway_view);
+	swayc_t *focus = sway_seat_get_focus_inactive(seat, &root_container);
+	swayc_t *cont = new_view(focus, sway_view);
 	sway_view->swayc = cont;
 
 	arrange_windows(cont->parent, -1, -1);