Commit b8157407 authored by Sven Herzberg's avatar Sven Herzberg Committed by Sven Herzberg
Browse files

reviewed by: Tim Janik

2006-03-28  Sven Herzberg  <herzi@gnome-de.org>

        reviewed by: Tim Janik

	* gtk/gtkpixmap.c: (gtk_pixmap_set): only check for equal colormaps if
	the new pixmap is not NULL; fixes a warning when gtk_pixmap_set is
	called from gtk_pixmap_finalize (bug 336254)
parent 856ee02f
2006-03-28 Sven Herzberg <herzi@gnome-de.org>
reviewed by: Tim Janik
* gtk/gtkpixmap.c: (gtk_pixmap_set): only check for equal colormaps if
the new pixmap is not NULL; fixes a warning when gtk_pixmap_set is
called from gtk_pixmap_finalize (bug 336254)
2006-03-27 Anders Carlsson <andersca@imendio.com> 2006-03-27 Anders Carlsson <andersca@imendio.com>
* gdk/quartz/gdkevents-quartz.c: * gdk/quartz/gdkevents-quartz.c:
......
2006-03-28 Sven Herzberg <herzi@gnome-de.org>
reviewed by: Tim Janik
* gtk/gtkpixmap.c: (gtk_pixmap_set): only check for equal colormaps if
the new pixmap is not NULL; fixes a warning when gtk_pixmap_set is
called from gtk_pixmap_finalize (bug 336254)
2006-03-27 Anders Carlsson <andersca@imendio.com> 2006-03-27 Anders Carlsson <andersca@imendio.com>
* gdk/quartz/gdkevents-quartz.c: * gdk/quartz/gdkevents-quartz.c:
......
...@@ -131,6 +131,7 @@ gtk_pixmap_set (GtkPixmap *pixmap, ...@@ -131,6 +131,7 @@ gtk_pixmap_set (GtkPixmap *pixmap,
gint oldheight; gint oldheight;
g_return_if_fail (GTK_IS_PIXMAP (pixmap)); g_return_if_fail (GTK_IS_PIXMAP (pixmap));
if(GDK_IS_DRAWABLE(val))
g_return_if_fail (gdk_colormap_get_visual (gtk_widget_get_colormap (GTK_WIDGET (pixmap)))->depth == gdk_drawable_get_depth (GDK_DRAWABLE (val))); g_return_if_fail (gdk_colormap_get_visual (gtk_widget_get_colormap (GTK_WIDGET (pixmap)))->depth == gdk_drawable_get_depth (GDK_DRAWABLE (val)));
if (pixmap->pixmap != val) if (pixmap->pixmap != val)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment