diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-06-03 04:52:54 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-06-03 04:52:54 +0000 |
| commit | 70a34967d654a957081c18b0da13944ac8af652a (patch) | |
| tree | aa23f398915d5e031f305845c446bb32e5d81d03 /openbox | |
| parent | f7b687487cf26042ac79f2587fb1eaf1760a7a0b (diff) | |
ignore xerrors while using the pixmaps specified by the client, since they can certainly be invalid and there's nothing i can do about it.
Diffstat (limited to 'openbox')
| -rw-r--r-- | openbox/client.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/openbox/client.c b/openbox/client.c index d1890956..9e56de05 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1,5 +1,6 @@ #include "client.h" #include "dock.h" +#include "xerror.h" #include "startup.h" #include "screen.h" #include "moveresize.h" @@ -1362,6 +1363,7 @@ void client_update_icons(Client *self) if (num == 2) { self->nicons++; self->icons = g_new(Icon, self->nicons); + xerror_set_ignore(TRUE); if (!render_pixmap_to_rgba(data[0], data[1], &self->icons[self->nicons-1].width, &self->icons[self->nicons-1].height, @@ -1369,6 +1371,7 @@ void client_update_icons(Client *self) g_free(&self->icons[self->nicons-1]); self->nicons--; } + xerror_set_ignore(FALSE); } g_free(data); } else { @@ -1378,6 +1381,7 @@ void client_update_icons(Client *self) if (hints->flags & IconPixmapHint) { self->nicons++; self->icons = g_new(Icon, self->nicons); + xerror_set_ignore(TRUE); if (!render_pixmap_to_rgba(hints->icon_pixmap, (hints->flags & IconMaskHint ? hints->icon_mask : None), @@ -1387,6 +1391,7 @@ void client_update_icons(Client *self) g_free(&self->icons[self->nicons-1]); self->nicons--; } + xerror_set_ignore(FALSE); } XFree(hints); } |