summaryrefslogtreecommitdiff
path: root/sway/main.c
diff options
context:
space:
mode:
authorTony Crisci <[email protected]>2018-03-29 23:41:33 -0400
committerTony Crisci <[email protected]>2018-03-29 23:41:33 -0400
commitdc8c9fbeb664518c76066cc28ee29452c6c30128 (patch)
tree88c2de0d08e00b2a30cb20cdfadfa6e53f5c59b4 /sway/main.c
parent472e81f35d689d67cda241acafda91c688d61046 (diff)
Revert "Merge pull request #1653 from swaywm/revert-1647-refactor-tree"
This reverts commit 472e81f35d689d67cda241acafda91c688d61046, reversing changes made to 6b7841b11ff4cd35f54d69dc92029855893e5ce0.
Diffstat (limited to 'sway/main.c')
-rw-r--r--sway/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/main.c b/sway/main.c
index f2f24be3..ded922ee 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -18,7 +18,7 @@
#include <wlr/util/log.h>
#include "sway/config.h"
#include "sway/server.h"
-#include "sway/layout.h"
+#include "sway/tree/layout.h"
#include "sway/ipc-server.h"
#include "ipc-client.h"
#include "readline.h"
@@ -382,7 +382,7 @@ int main(int argc, char **argv) {
wlr_log(L_INFO, "Starting sway version " SWAY_VERSION);
- init_layout();
+ layout_init();
if (!server_init(&server)) {
return 1;