diff options
author | Tony Crisci <tony@dubstepdish.com> | 2018-03-29 23:41:33 -0400 |
---|---|---|
committer | Tony Crisci <tony@dubstepdish.com> | 2018-03-29 23:41:33 -0400 |
commit | dc8c9fbeb664518c76066cc28ee29452c6c30128 (patch) | |
tree | 88c2de0d08e00b2a30cb20cdfadfa6e53f5c59b4 /sway/main.c | |
parent | Merge pull request #1653 from swaywm/revert-1647-refactor-tree (diff) | |
download | sway-dc8c9fbeb664518c76066cc28ee29452c6c30128.tar.gz sway-dc8c9fbeb664518c76066cc28ee29452c6c30128.tar.zst sway-dc8c9fbeb664518c76066cc28ee29452c6c30128.zip |
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.c | 4 |
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 @@ | |||
18 | #include <wlr/util/log.h> | 18 | #include <wlr/util/log.h> |
19 | #include "sway/config.h" | 19 | #include "sway/config.h" |
20 | #include "sway/server.h" | 20 | #include "sway/server.h" |
21 | #include "sway/layout.h" | 21 | #include "sway/tree/layout.h" |
22 | #include "sway/ipc-server.h" | 22 | #include "sway/ipc-server.h" |
23 | #include "ipc-client.h" | 23 | #include "ipc-client.h" |
24 | #include "readline.h" | 24 | #include "readline.h" |
@@ -382,7 +382,7 @@ int main(int argc, char **argv) { | |||
382 | 382 | ||
383 | wlr_log(L_INFO, "Starting sway version " SWAY_VERSION); | 383 | wlr_log(L_INFO, "Starting sway version " SWAY_VERSION); |
384 | 384 | ||
385 | init_layout(); | 385 | layout_init(); |
386 | 386 | ||
387 | if (!server_init(&server)) { | 387 | if (!server_init(&server)) { |
388 | return 1; | 388 | return 1; |