From: Derek Foreman <manmower@gmail.com>
Date: Mon, 9 Jun 2003 22:32:02 +0000 (+0000)
Subject: | != &
X-Git-Tag: gl-oldtheme~18
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=1bf52524a45646ecd165c31d068b9703785e1163;p=dana%2Fopenbox.git

| != &
---

diff --git a/openbox/client.c b/openbox/client.c
index c54dbd67..607bd561 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1348,7 +1348,7 @@ void client_update_icons(Client *self)
                     x = 0;
                     ++y;
                 }
-                self->icons[j].data[t] = (data[i] << 8) & (data[i] >> 24);
+                self->icons[j].data[t] = (data[i] << 8) | (data[i] >> 24);
             }
 	    g_assert(i <= num);
 	}