summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2009-02-13 16:54:20 +0100
committerDennis kasprzyk <onestone@compiz-fusion.org>2009-02-13 16:54:20 +0100
commit36edd5272fcd331bdc1330aa6763cb404a7ca156 (patch)
tree4883800e3d4afe285e71fd04c8041c741e1d738d
parent2263479be657413964823fde1575afb077602097 (diff)
parent27cc9c5178921ce6d6266f4b00303913163be7ee (diff)
downloadzcomp-36edd5272fcd331bdc1330aa6763cb404a7ca156.tar.gz
zcomp-36edd5272fcd331bdc1330aa6763cb404a7ca156.tar.bz2
Merge branch 'master' of git+ssh://git.compiz-fusion.org/git/compiz/core
-rw-r--r--gtk/window-decorator/gtk-window-decorator.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
index dd7ee68..91f676c 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -673,32 +673,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)