Commit d1d009b4 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Merge branch 'x11-quiet-exit' into 'master'

x11: Be quiet on exit by default

See merge request !3436
parents 4465ee54 6f11165d
Pipeline #274444 passed with stages
in 21 minutes and 53 seconds
...@@ -185,24 +185,13 @@ gdk_x_io_error (Display *display) ...@@ -185,24 +185,13 @@ gdk_x_io_error (Display *display)
/* This is basically modelled after the code in XLib. We need /* This is basically modelled after the code in XLib. We need
* an explicit error handler here, so we can disable our atexit() * an explicit error handler here, so we can disable our atexit()
* which would otherwise cause a nice segfault. * which would otherwise cause a nice segfault.
* We fprintf(stderr, instead of g_warning() because g_warning() * We g_debug() instead of g_warning(), because g_warning()
* could possibly be redirected to a dialog * could possibly be redirected to the log
*/ */
if (errno == EPIPE) g_debug ("%s: Fatal IO error %d (%s) on X server %s.\n",
{ g_get_prgname (),
g_message ("The application '%s' lost its connection to the display %s;\n" errno, g_strerror (errno),
"most likely the X server was shut down or you killed/destroyed\n" display ? DisplayString (display) : "");
"the application.\n",
g_get_prgname (),
display ? DisplayString (display) : NULL);
}
else
{
g_message ("%s: Fatal IO error %d (%s) on X server %s.\n",
g_get_prgname (),
errno, g_strerror (errno),
display ? DisplayString (display) : NULL);
}
_exit (1); _exit (1);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment