summaryrefslogtreecommitdiff
path: root/sway/main.c
diff options
context:
space:
mode:
authorDrew DeVault <[email protected]>2018-03-29 23:34:14 -0400
committerGitHub <[email protected]>2018-03-29 23:34:14 -0400
commit472e81f35d689d67cda241acafda91c688d61046 (patch)
treeb8b52173a9791e3b13a0316ab9d316a80a6adc20 /sway/main.c
parent6b7841b11ff4cd35f54d69dc92029855893e5ce0 (diff)
parentd0c7f66e950689b70196a890b62b82ff3c66e103 (diff)
Merge pull request #1653 from swaywm/revert-1647-refactor-tree
Revert "Refactor tree"
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 ded922ee..f2f24be3 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/tree/layout.h"
+#include "sway/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);
- layout_init();
+ init_layout();
if (!server_init(&server)) {
return 1;