diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2021-03-23 16:57:00 +0100 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2021-10-26 16:55:12 +0200 |
| commit | fb78ac401647e46ee437324811e1e99575d057cd (patch) | |
| tree | 8a80c1458afd87cb74c30eb8c42f7f6a4632e4c7 /src/wayland/meta-xwayland.c | |
| parent | b4fe1fdd95d52e8625c66ded1ec7162371dcf32b (diff) | |
| download | mutter-fb78ac401647e46ee437324811e1e99575d057cd.tar.gz | |
xwayland: Init/shutdown DND using MetaX11Display
Before it was passed an Display pointer, and had to e.g. fetch the root
window from GDK instead of the MetaX11Display.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1796>
Diffstat (limited to 'src/wayland/meta-xwayland.c')
| -rw-r--r-- | src/wayland/meta-xwayland.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wayland/meta-xwayland.c b/src/wayland/meta-xwayland.c index 84db7bc66..c0dbe7b09 100644 --- a/src/wayland/meta-xwayland.c +++ b/src/wayland/meta-xwayland.c @@ -1218,9 +1218,9 @@ static void on_x11_display_closing (MetaDisplay *display, MetaXWaylandManager *manager) { - Display *xdisplay = meta_x11_display_get_xdisplay (display->x11_display); + MetaX11Display *x11_display = meta_display_get_x11_display (display); - meta_xwayland_shutdown_dnd (manager, xdisplay); + meta_xwayland_shutdown_dnd (manager, x11_display); g_signal_handlers_disconnect_by_func (meta_monitor_manager_get (), monitors_changed_cb, NULL); @@ -1263,7 +1263,7 @@ on_x11_display_setup (MetaDisplay *display, Display *xdisplay = meta_x11_display_get_xdisplay (x11_display); MetaX11DisplayPolicy x11_display_policy; - meta_xwayland_init_dnd (xdisplay); + meta_xwayland_init_dnd (x11_display); meta_xwayland_init_xrandr (manager, xdisplay); meta_xwayland_stop_xserver_timeout (manager); |