diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-03-29 23:29:29 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-29 23:29:29 -0400 |
commit | d0c7f66e950689b70196a890b62b82ff3c66e103 (patch) | |
tree | b8b52173a9791e3b13a0316ab9d316a80a6adc20 /sway/main.c | |
parent | Merge pull request #1647 from acrisci/refactor-tree (diff) | |
download | sway-d0c7f66e950689b70196a890b62b82ff3c66e103.tar.gz sway-d0c7f66e950689b70196a890b62b82ff3c66e103.tar.zst sway-d0c7f66e950689b70196a890b62b82ff3c66e103.zip |
Revert "Refactor tree"
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 ded922ee..f2f24be3 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/tree/layout.h" | 21 | #include "sway/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 | layout_init(); | 385 | init_layout(); |
386 | 386 | ||
387 | if (!server_init(&server)) { | 387 | if (!server_init(&server)) { |
388 | return 1; | 388 | return 1; |