summaryrefslogtreecommitdiff
path: root/libwnck/pager.c
diff options
context:
space:
mode:
authorVincent Untz <vuntz@gnome.org>2011-02-18 19:52:31 +0100
committerVincent Untz <vuntz@gnome.org>2011-02-18 19:52:31 +0100
commit9699c781e456af93f9f150f07338f333403be47a (patch)
tree937d462fc52addad41917c803a2ed50d60c3f626 /libwnck/pager.c
parent20816b65fb9596f44beb0998198541ee4af06d57 (diff)
downloadlibwnck-9699c781e456af93f9f150f07338f333403be47a.tar.gz
core: Push/pop error trap in _wnck_cairo_surface_get_from_pixmap()
We were doing that in its callers, which is not intuitive for the callers.
Diffstat (limited to 'libwnck/pager.c')
-rw-r--r--libwnck/pager.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/libwnck/pager.c b/libwnck/pager.c
index 707d8bb..1a896b3 100644
--- a/libwnck/pager.c
+++ b/libwnck/pager.c
@@ -2848,15 +2848,10 @@ wnck_pager_get_background (WnckPager *pager,
if (p != None)
{
- Display *display;
- Screen *xscreen;
+ Screen *xscreen;
xscreen = WNCK_SCREEN_XSCREEN (pager->priv->screen);
- display = DisplayOfScreen (xscreen);
-
- _wnck_error_trap_push (display);
pix = _wnck_gdk_pixbuf_get_from_pixmap (xscreen, p);
- _wnck_error_trap_pop (display);
}
if (pix)