fixed to accomodate the changes to the render/ API.

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 249309094209cdab75f6b2d96e6a3c415beb2373..d7a99def5c6d125fe9b1109cbd0c180ffa96fee6 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1355,10 +1355,11 @@ void client_update_icons(Client *self)
             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,
-                                       &self->icons[self->nicons-1].data)) {
+            if (!RrPixmapToRGBA(ob_rr_inst,
+                                data[0], data[1],
+                                &self->icons[self->nicons-1].width,
+                                &self->icons[self->nicons-1].height,
+                                &self->icons[self->nicons-1].data)) {
                 g_free(&self->icons[self->nicons-1]);
                 self->nicons--;
             }
@@ -1373,12 +1374,13 @@ 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,
-                                           (hints->flags & IconMaskHint ?
-                                            hints->icon_mask : None),
-                                           &self->icons[self->nicons-1].width,
-                                           &self->icons[self->nicons-1].height,
-                                           &self->icons[self->nicons-1].data)){
+                if (!RrPixmapToRGBA(ob_rr_inst,
+                                    hints->icon_pixmap,
+                                    (hints->flags & IconMaskHint ?
+                                     hints->icon_mask : None),
+                                    &self->icons[self->nicons-1].width,
+                                    &self->icons[self->nicons-1].height,
+                                    &self->icons[self->nicons-1].data)){
                     g_free(&self->icons[self->nicons-1]);
                     self->nicons--;
                 }