aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-05-29 20:24:24 -0400
committerGitHub <noreply@github.com>2018-05-29 20:24:24 -0400
commitf076cc45ee9e5483323de62c58494abe72357b20 (patch)
treec042441eda2bfdcebbe4f1e9db347db0006e13fa
parent87fe9f3466bddeef4b6fb288a52b6b3bd288b3c5 (diff)
parentf9ad63c5cb8aa3cccadcbf85fd3e43070f41f026 (diff)
Merge pull request #1016 from emersion/wl-display-destroy-clients
rootston: use wl_display_destroy_clients
-rw-r--r--meson.build2
-rw-r--r--rootston/main.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 597236ca..b78eea01 100644
--- a/meson.build
+++ b/meson.build
@@ -46,7 +46,7 @@ endif
# Avoid wl_buffer deprecation warnings
add_project_arguments('-DWL_HIDE_DEPRECATED', language: 'c')
-wayland_server = dependency('wayland-server')
+wayland_server = dependency('wayland-server', version: '>=1.15')
wayland_client = dependency('wayland-client')
wayland_egl = dependency('wayland-egl')
wayland_protos = dependency('wayland-protocols', version: '>=1.14')
diff --git a/rootston/main.c b/rootston/main.c
index cecdb23d..07a41d5d 100644
--- a/rootston/main.c
+++ b/rootston/main.c
@@ -72,6 +72,7 @@ int main(int argc, char **argv) {
}
wl_display_run(server.wl_display);
+ wl_display_destroy_clients(server.wl_display);
wl_display_destroy(server.wl_display);
return 0;
}