mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

util/global: remove wl_display arg from wlr_global_destroy_safe

Browse source 
Since [1], we can get the wl_display directly from the wl_global.

[1]: 2b22160fb6
This commit is contained in:
Simon Ser 2021-06-29 19:12:50 +02:00 • committed by Simon Zeni
parent 4c59f7d46a
commit 4377b55292
5 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
util/global.c
View file

@ -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) {