diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c index 075d4ac65..acb0599df 100644 --- a/src/compositor/compositor.c +++ b/src/compositor/compositor.c @@ -491,7 +491,7 @@ redirect_windows (MetaScreen *screen) */ while (TRUE) { - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); XCompositeRedirectSubwindows (xdisplay, xroot, CompositeRedirectManual); XSync (xdisplay, FALSE); diff --git a/src/core/display.c b/src/core/display.c index 231249625..c234ad8e8 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -2206,7 +2206,7 @@ meta_change_button_grab (MetaDisplay *display, mods = (XIGrabModifiers) { modmask | ignored_mask, 0 }; if (meta_is_debugging ()) - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); /* GrabModeSync means freeze until XAllowEvents */ diff --git a/src/core/errors.c b/src/core/errors.c index 56a7bd423..f199c69b2 100644 --- a/src/core/errors.c +++ b/src/core/errors.c @@ -55,12 +55,6 @@ meta_error_trap_pop (MetaDisplay *display) gdk_error_trap_pop_ignored (); } -void -meta_error_trap_push_with_return (MetaDisplay *display) -{ - gdk_error_trap_push (); -} - int meta_error_trap_pop_with_return (MetaDisplay *display) { diff --git a/src/core/events.c b/src/core/events.c index 8546ce672..97adfc4f4 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -1051,7 +1051,7 @@ convert_property (MetaDisplay *display, conversion_targets[2] = display->atom_TIMESTAMP; conversion_targets[3] = display->atom_VERSION; - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); if (target == display->atom_TARGETS) XChangeProperty (display->xdisplay, w, property, XA_ATOM, 32, PropModeReplace, @@ -1126,7 +1126,7 @@ process_selection_request (MetaDisplay *display, unsigned long num, rest; unsigned char *data; - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); if (XGetWindowProperty (display->xdisplay, event->xselectionrequest.requestor, event->xselectionrequest.property, 0, 256, False, diff --git a/src/core/keybindings.c b/src/core/keybindings.c index e663311fb..88ff425fc 100644 --- a/src/core/keybindings.c +++ b/src/core/keybindings.c @@ -1065,7 +1065,7 @@ meta_change_keygrab (MetaDisplay *display, mods = (XIGrabModifiers) { modmask | ignored_mask, 0 }; if (meta_is_debugging ()) - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); if (grab) XIGrabKeycode (display->xdisplay, META_VIRTUAL_CORE_KEYBOARD_ID, @@ -1410,7 +1410,7 @@ grab_keyboard (MetaDisplay *display, /* Grab the keyboard, so we get key releases and all key * presses */ - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); /* Strictly, we only need to set grab_mode on the keyboard device * while the pointer should always be XIGrabModeAsync. Unfortunately diff --git a/src/core/screen.c b/src/core/screen.c index 030bab78c..d2c05b07a 100644 --- a/src/core/screen.c +++ b/src/core/screen.c @@ -560,7 +560,7 @@ meta_screen_new (MetaDisplay *display, } /* We want to find out when the current selection owner dies */ - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); attrs.event_mask = StructureNotifyMask; XChangeWindowAttributes (xdisplay, current_wm_sn_owner, CWEventMask, &attrs); @@ -619,7 +619,7 @@ meta_screen_new (MetaDisplay *display, } /* select our root window events */ - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); /* We need to or with the existing event mask since * gtk+ may be interested in other events. @@ -838,7 +838,7 @@ meta_screen_free (MetaScreen *screen, meta_stack_free (screen->stack); meta_stack_tracker_free (screen->stack_tracker); - meta_error_trap_push_with_return (screen->display); + meta_error_trap_push (screen->display); XSelectInput (screen->display->xdisplay, screen->xroot, 0); if (meta_error_trap_pop_with_return (screen->display) != Success) meta_warning ("Could not release screen %d on display \"%s\"\n", diff --git a/src/core/window.c b/src/core/window.c index 0ba7980ab..60a69f304 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -3953,7 +3953,7 @@ meta_window_create_sync_request_alarm (MetaWindow *window) window->sync_request_alarm != None) return; - meta_error_trap_push_with_return (window->display); + meta_error_trap_push (window->display); /* In the new (extended style), the counter value is initialized by * the client before mapping the window. In the old style, we're @@ -8038,7 +8038,7 @@ warp_grab_pointer (MetaWindow *window, *x = CLAMP (*x, 0, window->screen->rect.width-1); *y = CLAMP (*y, 0, window->screen->rect.height-1); - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); meta_topic (META_DEBUG_WINDOW_OPS, "Warping pointer to %d,%d with window at %d,%d\n", diff --git a/src/meta/errors.h b/src/meta/errors.h index d2aa27b6b..36bd9b703 100644 --- a/src/meta/errors.h +++ b/src/meta/errors.h @@ -30,7 +30,6 @@ void meta_error_trap_push (MetaDisplay *display); void meta_error_trap_pop (MetaDisplay *display); -void meta_error_trap_push_with_return (MetaDisplay *display); /* returns X error code, or 0 for no error */ int meta_error_trap_pop_with_return (MetaDisplay *display); diff --git a/src/x11/iconcache.c b/src/x11/iconcache.c index 30018d22e..ac09190f3 100644 --- a/src/x11/iconcache.c +++ b/src/x11/iconcache.c @@ -230,7 +230,7 @@ read_rgb_icon (MetaDisplay *display, int mini_w, mini_h; gulong *data_as_long; - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); type = None; data = NULL; result = XGetWindowProperty (display->xdisplay, @@ -504,7 +504,7 @@ get_kwm_win_icon (MetaDisplay *display, *pixmap = None; *mask = None; - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); icons = NULL; result = XGetWindowProperty (display->xdisplay, xwindow, display->atom__KWM_WIN_ICON, diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index 896003200..099a55dbd 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -1665,12 +1665,12 @@ meta_window_x11_client_message (MetaWindow *window, char *str1; char *str2; - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); str1 = XGetAtomName (display->xdisplay, first); if (meta_error_trap_pop_with_return (display) != Success) str1 = NULL; - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); str2 = XGetAtomName (display->xdisplay, second); if (meta_error_trap_pop_with_return (display) != Success) str2 = NULL; @@ -2298,7 +2298,7 @@ meta_window_x11_new (MetaDisplay *display, wm_state_to_string (existing_wm_state)); } - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); /* * XAddToSaveSet can only be called on windows created by a different @@ -2309,7 +2309,7 @@ meta_window_x11_new (MetaDisplay *display, */ XAddToSaveSet (display->xdisplay, xwindow); - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); event_mask = PropertyChangeMask; if (attrs.override_redirect) diff --git a/src/x11/xprops.c b/src/x11/xprops.c index e38006ae1..44c1113ca 100644 --- a/src/x11/xprops.c +++ b/src/x11/xprops.c @@ -191,7 +191,7 @@ get_property (MetaDisplay *display, results->bytes_after = 0; results->format = 0; - meta_error_trap_push_with_return (display); + meta_error_trap_push (display); if (XGetWindowProperty (display->xdisplay, xwindow, xatom, 0, G_MAXLONG, False, req_type, &results->type, &results->format,