48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From 9fddbce130442354cdcc7d575c0c747e2c1c3a0f Mon Sep 17 00:00:00 2001
|
|
From: Christopher Williams <crdlb@compiz-fusion.org>
|
|
Date: Wed, 11 Feb 2009 08:23:11 +0000
|
|
Subject: Fix compatibility with newer libmetacity-private versions.
|
|
|
|
GtkStyle is colormap specific, so we can't use a new colormap each time
|
|
we create a pixmap.
|
|
---
|
|
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
|
|
index 5b14eb6..0ab118c 100644
|
|
--- a/gtk/window-decorator/gtk-window-decorator.c
|
|
+++ b/gtk/window-decorator/gtk-window-decorator.c
|
|
@@ -637,32 +637,10 @@ static GdkPixmap *
|
|
create_pixmap (int w,
|
|
int h)
|
|
{
|
|
- GdkPixmap *pixmap;
|
|
- GdkVisual *visual;
|
|
- GdkColormap *colormap;
|
|
-
|
|
- visual = gdk_visual_get_best_with_depth (32);
|
|
- if (!visual)
|
|
- return NULL;
|
|
-
|
|
if (w == 0 || h ==0)
|
|
abort ();
|
|
|
|
- pixmap = gdk_pixmap_new (NULL, w, h, 32);
|
|
- if (!pixmap)
|
|
- return NULL;
|
|
-
|
|
- colormap = gdk_colormap_new (visual, FALSE);
|
|
- if (!colormap)
|
|
- {
|
|
- g_object_unref (G_OBJECT (pixmap));
|
|
- return NULL;
|
|
- }
|
|
-
|
|
- gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), colormap);
|
|
- g_object_unref (G_OBJECT (colormap));
|
|
-
|
|
- return pixmap;
|
|
+ return gdk_pixmap_new (GDK_DRAWABLE (style_window->window), w, h, 32);
|
|
}
|
|
|
|
#define CORNER_TOPLEFT (1 << 0)
|
|
|