brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "display: trap X errors in get_current_time_roundtrip"

Browse Source 
This reverts commit cc772ddd61be5fcb0412f1f871e5814d841362aa.
This commit is contained in:
Marco Trevisan (Treviño) 2017-10-20 03:22:59 -05:00
parent 35fcf4a4ae
commit 5d7deab6da
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/display.c
View File

@ -1326,24 +1326,14 @@ meta_display_get_current_time_roundtrip (MetaDisplay *display)
{ {
XEvent property_event; XEvent property_event;
meta_error_trap_push (display);
XChangeProperty (display->xdisplay, display->timestamp_pinging_window, XChangeProperty (display->xdisplay, display->timestamp_pinging_window,
display->atom__MUTTER_TIMESTAMP_PING, display->atom__MUTTER_TIMESTAMP_PING,
XA_STRING, 8, PropModeAppend, NULL, 0); XA_STRING, 8, PropModeAppend, NULL, 0);
XIfEvent (display->xdisplay,
if (meta_error_trap_pop_with_return (display) == Success) &property_event,
{ find_timestamp_predicate,
meta_error_trap_push (display); (XPointer) display);
timestamp = property_event.xproperty.time;
XIfEvent (display->xdisplay,
&property_event,
find_timestamp_predicate,
(XPointer) display);
if (meta_error_trap_pop_with_return (display) == Success)
timestamp = property_event.xproperty.time;
}
} }
meta_display_sanity_check_timestamps (display, timestamp); meta_display_sanity_check_timestamps (display, timestamp);