summaryrefslogtreecommitdiff
path: root/src/core/screen.c
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2019-01-06 12:44:59 +0100
committerZenWalker <[email protected]>2019-01-07 01:44:52 +0100
commit4940310cda91a4bea223deb7568fb77829518ded (patch)
treeceaddbf4ecb1a6fab84a1e936359cefc1c475952 /src/core/screen.c
parentb4dcd38a04c6ab44da5d8ac63b386419c9bda7a4 (diff)
downloadmarco-4940310cda91a4bea223deb7568fb77829518ded.tar.bz2
marco-4940310cda91a4bea223deb7568fb77829518ded.tar.xz
'meta_error_trap_push' instead 'meta_error_trap_push_with_return'
both functions have the same code
Diffstat (limited to 'src/core/screen.c')
-rw-r--r--src/core/screen.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/screen.c b/src/core/screen.c
index 1259ca8a..5bc5d2e2 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -379,7 +379,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);
@@ -438,7 +438,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.
@@ -669,7 +669,7 @@ meta_screen_free (MetaScreen *screen,
meta_stack_free (screen->stack);
- 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, FALSE) != Success)
meta_warning (_("Could not release screen %d on display \"%s\"\n"),
@@ -735,7 +735,7 @@ list_windows (MetaScreen *screen)
{
WindowInfo *info = g_new0 (WindowInfo, 1);
- meta_error_trap_push_with_return (screen->display);
+ meta_error_trap_push (screen->display);
XGetWindowAttributes (screen->display->xdisplay,
children[i], &info->attrs);