diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-09-14 21:03:59 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-09-14 21:03:59 -0400 |
| commit | 64d567be9b4a1341bca165f02354e077a2f112fb (patch) | |
| tree | 90b2a21c3a1cf5e0cdb8ef720081e7acfce64eee /sway/server.c | |
| parent | Merge branch 'master' into wlroots-1243 (diff) | |
| parent | Additional fix for xdg-output (diff) | |
| download | sway-64d567be9b4a1341bca165f02354e077a2f112fb.tar.gz sway-64d567be9b4a1341bca165f02354e077a2f112fb.tar.zst sway-64d567be9b4a1341bca165f02354e077a2f112fb.zip | |
Merge branch 'master' into wlroots-1243
Diffstat (limited to 'sway/server.c')
| -rw-r--r-- | sway/server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/server.c b/sway/server.c index 9440c10f..bed5aed1 100644 --- a/sway/server.c +++ b/sway/server.c | |||
| @@ -61,7 +61,7 @@ bool server_init(struct sway_server *server) { | |||
| 61 | server->new_output.notify = handle_new_output; | 61 | server->new_output.notify = handle_new_output; |
| 62 | wl_signal_add(&server->backend->events.new_output, &server->new_output); | 62 | wl_signal_add(&server->backend->events.new_output, &server->new_output); |
| 63 | 63 | ||
| 64 | wlr_xdg_output_manager_create(server->wl_display, root->output_layout); | 64 | wlr_xdg_output_manager_v1_create(server->wl_display, root->output_layout); |
| 65 | 65 | ||
| 66 | server->idle = wlr_idle_create(server->wl_display); | 66 | server->idle = wlr_idle_create(server->wl_display); |
| 67 | server->idle_inhibit_manager_v1 = | 67 | server->idle_inhibit_manager_v1 = |