From: Debarshi Ray <debarshir@gnome.org>
Date: Wed, 24 May 2017 14:42:01 +0000 (+0200)
Subject: wayland: Don't warn if the display is lost, skip exit handlers
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~526
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bebd5020ecc82d9327e29a4e3a96673badcc4aaf;p=gtk%2B3.0.git

wayland: Don't warn if the display is lost, skip exit handlers

There is no need to have every application log a warning when the
Wayland display server goes away, and we are using _exit instead of
exit elsewhere.

This is also what the X11 backend does (see gdk_x_io_error).

https://bugzilla.gnome.org/show_bug.cgi?id=745289
---

diff --git a/gdk/wayland/gdkeventsource.c b/gdk/wayland/gdkeventsource.c
index bdb4c80e1e..7016af99c3 100644
--- a/gdk/wayland/gdkeventsource.c
+++ b/gdk/wayland/gdkeventsource.c
@@ -20,7 +20,7 @@
 #include "gdkinternals.h"
 #include "gdkprivate-wayland.h"
 
-#include <stdlib.h>
+#include <unistd.h>
 #include <errno.h>
 
 typedef struct _GdkWaylandEventSource {
@@ -200,15 +200,15 @@ _gdk_wayland_display_queue_events (GdkDisplay *display)
 
   if (wl_display_dispatch_pending (display_wayland->wl_display) < 0)
     {
-      g_warning ("Error %d (%s) dispatching to Wayland display.",
+      g_message ("Error %d (%s) dispatching to Wayland display.",
                  errno, g_strerror (errno));
-      exit (1);
+      _exit (1);
     }
 
   if (source->pfd.revents & (G_IO_ERR | G_IO_HUP))
     {
-      g_warning ("Lost connection to Wayland compositor.");
-      exit (1);
+      g_message ("Lost connection to Wayland compositor.");
+      _exit (1);
     }
   source->pfd.revents = 0;
 }