From e572da5229cd9b847e2e2264c8b4dd911597f13b Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Tue, 17 Jun 2003 01:20:55 +0000 Subject: [PATCH] wake up old icon grabbing code --- openbox/client.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/openbox/client.c b/openbox/client.c index 82e1f5f6..0740392e 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -17,6 +17,7 @@ #include "config.h" #include "menu.h" #include "render2/render.h" +#include "render2/color.h" #include #include @@ -1354,14 +1355,14 @@ void client_update_icons(Client *self) } g_free(data); - }/* XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX - else if (PROP_GETA32(self->window, kwm_win_icon, - kwm_win_icon, &data, &num)) { + } + else if (PROP_GETA32(self->window, kwm_win_icon, + 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], + if (!RrPixmapToRGBA(ob_render_inst, data[0], data[1], &self->icons[self->nicons-1].width, &self->icons[self->nicons-1].height, &self->icons[self->nicons-1].data)) { @@ -1379,7 +1380,7 @@ void client_update_icons(Client *self) self->nicons++; self->icons = g_new(Icon, self->nicons); xerror_set_ignore(TRUE); - if (!render_pixmap_to_rgba(hints->icon_pixmap, + if (!RrPixmapToRGBA(ob_render_inst, hints->icon_pixmap, (hints->flags & IconMaskHint ? hints->icon_mask : None), &self->icons[self->nicons-1].width, @@ -1393,7 +1394,6 @@ void client_update_icons(Client *self) XFree(hints); } } -*/ if (self->frame) frame_adjust_icon(self->frame); -- 2.34.1