+Sun Dec 8 20:32:23 2002 Owen Taylor <otaylor@redhat.com>
+
+ More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colors_free)
+ (gdk_colormap_free_colors): Don't call XFreeColors() for
+ private colorsmaps.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable,
+ gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared):
+ Fix return values to return number remaining not number
+ allocated.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared,
+ gdk_colormap_alloc_colors_private): Clean up some a stray
+ initializations.
+
Sun Dec 8 20:19:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
+Sun Dec 8 20:32:23 2002 Owen Taylor <otaylor@redhat.com>
+
+ More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colors_free)
+ (gdk_colormap_free_colors): Don't call XFreeColors() for
+ private colorsmaps.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable,
+ gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared):
+ Fix return values to return number remaining not number
+ allocated.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared,
+ gdk_colormap_alloc_colors_private): Clean up some a stray
+ initializations.
+
Sun Dec 8 20:19:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
+Sun Dec 8 20:32:23 2002 Owen Taylor <otaylor@redhat.com>
+
+ More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colors_free)
+ (gdk_colormap_free_colors): Don't call XFreeColors() for
+ private colorsmaps.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable,
+ gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared):
+ Fix return values to return number remaining not number
+ allocated.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared,
+ gdk_colormap_alloc_colors_private): Clean up some a stray
+ initializations.
+
Sun Dec 8 20:19:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
+Sun Dec 8 20:32:23 2002 Owen Taylor <otaylor@redhat.com>
+
+ More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colors_free)
+ (gdk_colormap_free_colors): Don't call XFreeColors() for
+ private colorsmaps.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable,
+ gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared):
+ Fix return values to return number remaining not number
+ allocated.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared,
+ gdk_colormap_alloc_colors_private): Clean up some a stray
+ initializations.
+
Sun Dec 8 20:19:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
+Sun Dec 8 20:32:23 2002 Owen Taylor <otaylor@redhat.com>
+
+ More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colors_free)
+ (gdk_colormap_free_colors): Don't call XFreeColors() for
+ private colorsmaps.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable,
+ gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared):
+ Fix return values to return number remaining not number
+ allocated.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared,
+ gdk_colormap_alloc_colors_private): Clean up some a stray
+ initializations.
+
Sun Dec 8 20:19:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
+Sun Dec 8 20:32:23 2002 Owen Taylor <otaylor@redhat.com>
+
+ More fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colors_free)
+ (gdk_colormap_free_colors): Don't call XFreeColors() for
+ private colorsmaps.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_writeable,
+ gdk_colormap_colors_private, gdk_colormap_alloc_colors_shared):
+ Fix return values to return number remaining not number
+ allocated.
+
+ * gdk/x11/gdkcolor-x11.c (gdk_colormap_alloc_colors_shared,
+ gdk_colormap_alloc_colors_private): Clean up some a stray
+ initializations.
+
Sun Dec 8 20:19:22 2002 Owen Taylor <otaylor@redhat.com>
Fixes for GdkColormapX11 (#100023, Naofumi Yasufuku)
}
}
- if (npixels_to_free && !private->screen->closed)
+ if (npixels_to_free && !private->private_val && !private->screen->closed)
XFreeColors (GDK_SCREEN_XDISPLAY (private->screen), private->xcolormap,
pixels_to_free, npixels_to_free, planes);
g_free (pixels_to_free);
}
}
- if (npixels && !private->screen->closed)
+ if (npixels_to_free && !private->private_val && !private->screen->closed)
XFreeColors (GDK_SCREEN_XDISPLAY (private->screen), private->xcolormap,
pixels, npixels, 0);
else
break;
}
- return i;
+ return ncolors - i;
}
else
{
g_free (pixels);
- return status ? ncolors : 0;
+ return status ? 0 : ncolors;
}
}
gint nremaining = 0;
private = GDK_COLORMAP_PRIVATE_DATA (colormap);
- index = -1;
/* First, store the colors we have room for */
g_free (available);
}
- return (ncolors - nremaining);
+ return nremaining;
}
static gint
gint nfailed = 0;
private = GDK_COLORMAP_PRIVATE_DATA (colormap);
- index = -1;
for (i=0; i<ncolors; i++)
{
nremaining = nfailed;
}
- return (ncolors - nremaining);
+ return nremaining;
}
static gint