callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: Handle the display connection erroring out

Browse Source 
wl_display_flush or wl_display_dispatch can return -1 if there is an
error on the display connection.

https://bugzilla.gnome.org/show_bug.cgi?id=703892
This commit is contained in:
Rob Bradford
2013-07-09 18:08:21 +01:00
committed by Kristian Høgsberg
parent 99b78fdd7f
commit af26a18032
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gdk/wayland/gdkeventsource.c
View File

@ -20,6 +20,8 @@
#include "gdkinternals.h"
#include "gdkprivate-wayland.h"
#include <errno.h>
typedef struct _GdkWaylandEventSource {
GSource source;
GPollFD pfd;
@ -47,7 +49,8 @@ gdk_event_source_prepare(GSource *base, gint *timeout)
if (_gdk_event_queue_find_first (source->display) != NULL)
return TRUE;
wl_display_flush(display->wl_display);
if (wl_display_flush (display->wl_display) < 0)
g_error ("Error dispatching display: %s", g_strerror (errno));
return FALSE;
}
@ -152,7 +155,10 @@ _gdk_wayland_display_queue_events (GdkDisplay *display)
source = (GdkWaylandEventSource *) display_wayland->event_source;
if (source->pfd.revents & G_IO_IN)
wl_display_dispatch (display_wayland->wl_display);
{
if (wl_display_dispatch (display_wayland->wl_display) < 0)
g_error ("Error dispatching display: %s", g_strerror (errno));
}
if (source->pfd.revents & (G_IO_ERR | G_IO_HUP))
g_error ("Lost connection to wayland compositor");