From 75de29f5f7768b50f191724626e2878312936230 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Sun, 6 Apr 2014 15:54:47 -0400
Subject: [PATCH] errors: Remove vestigals of old error trap implementation

---
 src/core/display-private.h | 5 +----
 src/core/display.c         | 6 ------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/core/display-private.h b/src/core/display-private.h
index 1b8355c72..84ee5a809 100644
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -147,13 +147,10 @@ struct _MetaDisplay
   guint focused_by_us : 1;
   
   /*< private-ish >*/
-  guint error_trap_synced_at_last_pop : 1;
   MetaScreen *screen;
   GHashTable *xids;
   GHashTable *wayland_windows;
-  int error_traps;
-  int (* error_trap_handler) (Display     *display,
-                              XErrorEvent *error);  
+
   int server_grab_count;
 
   /* serials of leave/unmap events that may
diff --git a/src/core/display.c b/src/core/display.c
index 716f864f9..231249625 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -472,9 +472,6 @@ meta_display_open (void)
    */
   the_display->name = g_strdup (XDisplayName (NULL));
   the_display->xdisplay = xdisplay;
-  the_display->error_trap_synced_at_last_pop = TRUE;
-  the_display->error_traps = 0;
-  the_display->error_trap_handler = NULL;
   the_display->server_grab_count = 0;
   the_display->display_opening = TRUE;
 
@@ -1016,9 +1013,6 @@ meta_display_close (MetaDisplay *display,
       return;
     }
 
-  if (display->error_traps > 0)
-    meta_bug ("Display closed with error traps pending\n");
-
   display->closing += 1;
 
   meta_prefs_remove_listener (prefs_changed_callback, display);