From 31c036b9b44a9d14f878df8804fdaf16c922f376 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 31 Mar 2011 19:59:00 -0400
Subject: [PATCH] Call _exit instead of exit from X error handlers

This is because running atexit() handlers from there is
usually bad news.
https://bugzilla.gnome.org/show_bug.cgi?id=646338
---
 gdk/x11/gdkdisplay-x11.c | 2 +-
 gdk/x11/gdkmain-x11.c    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 2911a3a6b7..c4d776381a 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2372,7 +2372,7 @@ _gdk_x11_display_error_event (GdkDisplay  *display,
 #else /* !G_ENABLE_DEBUG */
       g_warning ("%s\n", msg);
 
-      exit (1);
+      _exit (1);
 #endif /* G_ENABLE_DEBUG */
     }
 }
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index e4cce5f9c6..dc57ce2d95 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -265,7 +265,7 @@ gdk_x_io_error (Display *display)
                  display ? DisplayString (display) : gdk_get_display_arg_name ());
     }
 
-  exit(1);
+  _exit (1);
 }
 
 /* X error handler. Keep the name the same because people are used to