[mutter] windows-x11.c: Fix leaked error trap
- From: Owen Taylor <otaylor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] windows-x11.c: Fix leaked error trap
- Date: Fri, 12 Sep 2014 21:29:43 +0000 (UTC)
commit 611f6741c2f756b649ad643f6c2fbc099928fe2d
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Fri Sep 12 16:30:31 2014 -0400
windows-x11.c: Fix leaked error trap
The merge of the commit af46ef3b 'meta_window_new: clean up error handling'
to the wayland branch accidentally added an extra call to meta_error_trap_push(),
meaning that we leaked one level of error traps for each new window.
Fixes warning:
Gdk-WARNING **: XSetErrorHandler() called with a GDK error trap pushed.
https://bugzilla.gnome.org/show_bug.cgi?id=736589
src/x11/window-x11.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
---
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
index 796a7be..ebbd226 100644
--- a/src/x11/window-x11.c
+++ b/src/x11/window-x11.c
@@ -2869,8 +2869,6 @@ meta_window_x11_new (MetaDisplay *display,
wm_state_to_string (existing_wm_state));
}
- meta_error_trap_push (display);
-
/*
* XAddToSaveSet can only be called on windows created by a different
* client. with Mutter we want to be able to create manageable windows
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]