mirror of
https://github.com/brl/mutter.git
synced 2025-08-03 07:04:41 +00:00
Switch meta_error_trap functions to MetaX11Display
They are X11 specific functions, used for X11 code. They have been improved per jadahl's suggestion to use gdk_x11_lookup_xdisplay and gdk_x11_display_error_trap_* functions, instead of current code. https://bugzilla.gnome.org/show_bug.cgi?id=759538
This commit is contained in:

committed by
Jonas Ådahl

parent
18779109de
commit
dacc041d0c
@@ -990,7 +990,7 @@ meta_stack_tracker_lower_below (MetaStackTracker *tracker,
|
||||
{
|
||||
serial = XNextRequest (x11_display->xdisplay);
|
||||
|
||||
meta_error_trap_push (tracker->screen->display);
|
||||
meta_error_trap_push (x11_display);
|
||||
|
||||
changes.stack_mode = changes.sibling ? Below : Above;
|
||||
|
||||
@@ -999,7 +999,7 @@ meta_stack_tracker_lower_below (MetaStackTracker *tracker,
|
||||
(changes.sibling ? CWSibling : 0) | CWStackMode,
|
||||
&changes);
|
||||
|
||||
meta_error_trap_pop (tracker->screen->display);
|
||||
meta_error_trap_pop (x11_display);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1025,7 +1025,7 @@ meta_stack_tracker_raise_above (MetaStackTracker *tracker,
|
||||
{
|
||||
serial = XNextRequest (x11_display->xdisplay);
|
||||
|
||||
meta_error_trap_push (tracker->screen->display);
|
||||
meta_error_trap_push (x11_display);
|
||||
|
||||
changes.stack_mode = changes.sibling ? Above : Below;
|
||||
|
||||
@@ -1034,7 +1034,7 @@ meta_stack_tracker_raise_above (MetaStackTracker *tracker,
|
||||
(changes.sibling ? CWSibling : 0) | CWStackMode,
|
||||
&changes);
|
||||
|
||||
meta_error_trap_pop (tracker->screen->display);
|
||||
meta_error_trap_pop (x11_display);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user