AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 06:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip/handle-more-wl-dispatch-failures' into 'main'

Browse Source 
wayland: Handle dispatch failing in a couple of more places

See merge request GNOME/gtk!5495
This commit is contained in:
Matthias Clasen 2023-02-11 19:56:45 +00:00
commit 04c3af537c
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/wayland/gdkpopup-wayland.c
View File

@ -1388,7 +1388,15 @@ gdk_wayland_surface_present_popup (GdkWaylandPopup *wayland_popup,
} }
while (wayland_popup->display_server.xdg_popup && !is_relayout_finished (surface)) while (wayland_popup->display_server.xdg_popup && !is_relayout_finished (surface))
wl_display_dispatch_queue (display_wayland->wl_display, wayland_surface->event_queue); {
if (wl_display_dispatch_queue (display_wayland->wl_display,
wayland_surface->event_queue) == -1)
{
g_message ("Error %d (%s) dispatching to Wayland display.",
errno, g_strerror (errno));
_exit (1);
}
}
if (wayland_popup->display_server.xdg_popup) if (wayland_popup->display_server.xdg_popup)
{ {

10
gdk/wayland/gdktoplevel-wayland.c
View File

@ -2119,7 +2119,15 @@ gdk_wayland_toplevel_focus (GdkToplevel *toplevel,
xdg_activation_token_v1_commit (token); xdg_activation_token_v1_commit (token);
while (startup_id == NULL) while (startup_id == NULL)
wl_display_dispatch_queue (display_wayland->wl_display, event_queue); {
if (wl_display_dispatch_queue (display_wayland->wl_display,
event_queue) == -1)
{
g_message ("Error %d (%s) dispatching to Wayland display.",
errno, g_strerror (errno));
_exit (1);
}
}
xdg_activation_token_v1_destroy (token); xdg_activation_token_v1_destroy (token);
wl_event_queue_destroy (event_queue); wl_event_queue_destroy (event_queue);