all repos — openbox @ 70a34967d654a957081c18b0da13944ac8af652a

openbox fork - make it a bit more like ryudo 

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.
Dana Jansens danakj@orodu.net
commit

70a34967d654a957081c18b0da13944ac8af652a

parent

f7b687487cf26042ac79f2587fb1eaf1760a7a0b

1 files changed, 5 insertions(+), 0 deletions(-)

jump to
M openbox/client.c → 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 @@ kwm_win_icon, &data, &num)) {
         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 @@ &self->icons[self->nicons-1].data)) {
                 g_free(&self->icons[self->nicons-1]);
                 self->nicons--;
             }
+            xerror_set_ignore(FALSE);
         }
         g_free(data);
     } else {

@@ -1378,6 +1381,7 @@ if ((hints = XGetWMHints(ob_display, self->window))) {
             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 @@ &self->icons[self->nicons-1].data)){
                     g_free(&self->icons[self->nicons-1]);
                     self->nicons--;
                 }
+                xerror_set_ignore(FALSE);
             }
             XFree(hints);
         }