From 8a4f96aaa44606d39294e4804f4cd69b993be8ca Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Fri, 4 Feb 2005 18:23:13 +0000
Subject: [PATCH] Simplify colormap management in pixmap loading.
(Old svn revision: 12340)
---
src/mypixmap.c | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/src/mypixmap.c b/src/mypixmap.c
index 6e2308303..f2582732f 100644
--- a/src/mypixmap.c
+++ b/src/mypixmap.c
@@ -85,29 +85,11 @@ xfwmPixmapCompose (xfwmPixmap * pm, gchar * dir, gchar * file)
return FALSE;
}
- cmap = gdk_drawable_get_colormap (destw);
+ cmap = gdk_screen_get_default_colormap (pm->screen_info->gscr);
if (cmap)
{
g_object_ref (G_OBJECT (cmap));
}
- else
- {
- if (gdk_drawable_get_depth (destw) == 1)
- {
- cmap = NULL;
- }
- else
- {
- cmap = gdk_screen_get_rgb_colormap (pm->screen_info->gscr);
- g_object_ref (G_OBJECT (cmap));
- }
- }
-
- if (cmap && (gdk_colormap_get_visual (cmap)->depth != gdk_drawable_get_depth (destw)))
- {
- g_object_unref (G_OBJECT (cmap));
- cmap = NULL;
- }
width = MIN (gdk_pixbuf_get_width (alpha), pm->width);
height = MIN (gdk_pixbuf_get_height (alpha), pm->height);
--
GitLab