diff options
| author | Sven Herzberg <herzi@gnome-de.org> | 2006-03-27 23:01:59 +0000 |
|---|---|---|
| committer | Sven Herzberg <herzi@src.gnome.org> | 2006-03-27 23:01:59 +0000 |
| commit | b815740789af63e2e2c531a2cd4d29bc8f598462 (patch) | |
| tree | 1b2cf9c882e1d1f5bc32a3d5fd42a8706cf7ce80 /gtk/gtkpixmap.c | |
| parent | 856ee02fe4f7d8d059dcd9d2ff7b1ca7586b2451 (diff) | |
| download | gtk+-b815740789af63e2e2c531a2cd4d29bc8f598462.tar.gz | |
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)
Diffstat (limited to 'gtk/gtkpixmap.c')
| -rw-r--r-- | gtk/gtkpixmap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkpixmap.c b/gtk/gtkpixmap.c index e9680d2eb3..0b1d48261e 100644 --- a/gtk/gtkpixmap.c +++ b/gtk/gtkpixmap.c @@ -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) { |