isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 01:50:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

errors: Remove vestigals of old error trap implementation

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-04-06 15:54:47 -04:00
parent e2b24092d6
commit 75de29f5f7
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/display-private.h
View File

@ -147,13 +147,10 @@ struct _MetaDisplay
guint focused_by_us : 1; guint focused_by_us : 1;
/*< private-ish >*/ /*< private-ish >*/
guint error_trap_synced_at_last_pop : 1;
MetaScreen *screen; MetaScreen *screen;
GHashTable *xids; GHashTable *xids;
GHashTable *wayland_windows; GHashTable *wayland_windows;
int error_traps;
int (* error_trap_handler) (Display *display,
XErrorEvent *error);
int server_grab_count; int server_grab_count;
/* serials of leave/unmap events that may /* serials of leave/unmap events that may

6
src/core/display.c
View File

@ -472,9 +472,6 @@ meta_display_open (void)
*/ */
the_display->name = g_strdup (XDisplayName (NULL)); the_display->name = g_strdup (XDisplayName (NULL));
the_display->xdisplay = xdisplay; 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->server_grab_count = 0;
the_display->display_opening = TRUE; the_display->display_opening = TRUE;
@ -1016,9 +1013,6 @@ meta_display_close (MetaDisplay *display,
return; return;
} }
if (display->error_traps > 0)
meta_bug ("Display closed with error traps pending\n");
display->closing += 1; display->closing += 1;
meta_prefs_remove_listener (prefs_changed_callback, display); meta_prefs_remove_listener (prefs_changed_callback, display);