AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-10 02:40:11 +00:00
Code Issues Projects Releases Wiki Activity

reviewed by: Tim Janik

Browse Source 
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)
This commit is contained in:
Sven Herzberg 2006-03-27 23:01:59 +00:00 committed by Sven Herzberg
parent 856ee02fe4
commit b815740789
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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>
* gdk/quartz/gdkevents-quartz.c:

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
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>
* gdk/quartz/gdkevents-quartz.c:

3
gtk/gtkpixmap.c
View File

@ -131,7 +131,8 @@ gtk_pixmap_set (GtkPixmap *pixmap,
gint oldheight;
g_return_if_fail (GTK_IS_PIXMAP (pixmap));
g_return_if_fail (gdk_colormap_get_visual (gtk_widget_get_colormap (GTK_WIDGET (pixmap)))->depth == gdk_drawable_get_depth (GDK_DRAWABLE (val)));
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)));
if (pixmap->pixmap != val)
{