gtk+ r19970 - in branches/gtk-2-12: . gdk/x11

[matthiasc svn gnome org]

Author: matthiasc
Date: Thu Apr  3 06:11:06 2008
New Revision: 19970
URL: http://svn.gnome.org/viewvc/gtk+?rev=19970&view=rev

Log:
2008-04-02  Matthias Clasen  <mclasen redhat com>

        * gdk/x11/gdkcolor-x11.c: Don't call XFreeColormap on foreign
        colormaps.  Found by Daniel Berrange.




Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gdk/x11/gdkcolor-x11.c

Modified: branches/gtk-2-12/gdk/x11/gdkcolor-x11.c
==============================================================================
--- branches/gtk-2-12/gdk/x11/gdkcolor-x11.c	(original)
+++ branches/gtk-2-12/gdk/x11/gdkcolor-x11.c	Thu Apr  3 06:11:06 2008
@@ -46,7 +46,7 @@
   GdkColorInfo *info;
   time_t last_sync_time;
 
-  guint foreign : 1;
+  gboolean foreign;
 };
 
 #define GDK_COLORMAP_PRIVATE_DATA(cmap) ((GdkColormapPrivateX11 *) GDK_COLORMAP (cmap)->windowing_data)
@@ -107,7 +107,7 @@
 
   gdk_colormap_remove (colormap);
 
-  if (!private->screen->closed)
+  if (!private->screen->closed && !private->foreign)
     XFreeColormap (GDK_SCREEN_XDISPLAY (private->screen), private->xcolormap);
 
   if (private->hash)
@@ -1292,6 +1292,7 @@
   private->screen = screen;
   private->xcolormap = xcolormap;
   private->private_val = FALSE;
+  private->foreign = TRUE;
 
   colormap->size = visual->colormap_size;