diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-12-20 11:56:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-20 11:56:39 -0500 |
| commit | 373def44468e0c919031a6ffe3049f91680e05ca (patch) | |
| tree | e40dfdcc9292a71fcc2160bc5d643a66996664dc /sway/main.c | |
| parent | a51e74beb91a98181d6bc69137d377cd49e72d1f (diff) | |
| parent | 63f7fb95172a72436698a1562b4f7ea1e9100a7e (diff) | |
| download | sway-373def44468e0c919031a6ffe3049f91680e05ca.tar.xz | |
Merge pull request #1505 from acrisci/feature/input
input management and seat
Diffstat (limited to 'sway/main.c')
| -rw-r--r-- | sway/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/main.c b/sway/main.c index 8952f997..bd69395a 100644 --- a/sway/main.c +++ b/sway/main.c @@ -158,6 +158,7 @@ static void log_distro() { } static void log_kernel() { + return; FILE *f = popen("uname -a", "r"); if (!f) { sway_log(L_INFO, "Unable to determine kernel version"); @@ -381,11 +382,12 @@ int main(int argc, char **argv) { sway_log(L_INFO, "Starting sway version " SWAY_VERSION "\n"); + init_layout(); + if (!server_init(&server)) { return 1; } - init_layout(); ipc_init(&server); log_env(); |