From 4377b5529279aa9dab64256d22ad0f2e9009843c Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Tue, 29 Jun 2021 19:12:50 +0200
Subject: util/global: remove wl_display arg from wlr_global_destroy_safe
Since [1], we can get the wl_display directly from the wl_global.
[1]: https://gitlab.freedesktop.org/wayland/wayland/-/commit/2b22160fb690a76247aa9bd0be3069ff43e8239f
---
util/global.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'util')
diff --git a/util/global.c b/util/global.c
index a0d84ed3..fa99a994 100644
--- a/util/global.c
+++ b/util/global.c
@@ -14,8 +14,7 @@ static int destroy_global(void *_data) {
return 0;
}
-void wlr_global_destroy_safe(struct wl_global *global,
- struct wl_display *display) {
+void wlr_global_destroy_safe(struct wl_global *global) {
// Don't destroy the global immediately. If the global has been created
// recently, clients might try to bind to it after we've destroyed it.
// Instead, remove the global so that clients stop seeing it and wait an
@@ -25,6 +24,7 @@ void wlr_global_destroy_safe(struct wl_global *global,
wl_global_remove(global);
wl_global_set_user_data(global, NULL); // safety net
+ struct wl_display *display = wl_global_get_display(global);
struct wl_event_loop *event_loop = wl_display_get_event_loop(display);
struct destroy_global_data *data = calloc(1, sizeof(*data));
if (data == NULL) {
--
cgit v1.2.3