[mutter] Revert "display: trap X errors in get_current_time_roundtrip"

[Marco Trevisan <marcotrevi src gnome org>]

commit 5d7deab6da9740377082ea053b9769c697c12b3f
Author: Marco Trevisan (Treviño) <mail 3v1n0 net>
Date:   Fri Oct 20 03:22:59 2017 -0500

    Revert "display: trap X errors in get_current_time_roundtrip"
    
    This reverts commit cc772ddd61be5fcb0412f1f871e5814d841362aa.

 src/core/display.c |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/src/core/display.c b/src/core/display.c
index 6fc2ff7..dc4d8df 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1326,24 +1326,14 @@ meta_display_get_current_time_roundtrip (MetaDisplay *display)
     {
       XEvent property_event;
 
-      meta_error_trap_push (display);
-
       XChangeProperty (display->xdisplay, display->timestamp_pinging_window,
                        display->atom__MUTTER_TIMESTAMP_PING,
                        XA_STRING, 8, PropModeAppend, NULL, 0);
-
-      if (meta_error_trap_pop_with_return (display) == Success)
-        {
-          meta_error_trap_push (display);
-
-          XIfEvent (display->xdisplay,
-                    &property_event,
-                    find_timestamp_predicate,
-                    (XPointer) display);
-
-          if (meta_error_trap_pop_with_return (display) == Success)
-            timestamp = property_event.xproperty.time;
-        }
+      XIfEvent (display->xdisplay,
+                &property_event,
+                find_timestamp_predicate,
+                (XPointer) display);
+      timestamp = property_event.xproperty.time;
     }
 
   meta_display_sanity_check_timestamps (display, timestamp);