Commit 42dc0241 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Handle pixmap == NULL when checking for a colormap. (Allin Cottrell).

2005-08-15  Owen Taylor  <otaylor@redhat.com>

        * gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_back_pixmap):
        * gdk/win32/gdkwindow-win32.c (gdk_window_set_back_pixmap):
        * gdk/x11/gdkwindow-x11.c (gdk_window_set_back_pixmap):
        Handle pixmap == NULL when checking for a colormap.
        (Allin Cottrell).
parent 7ab66526
2005-08-15 Owen Taylor <otaylor@redhat.com>
* gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_back_pixmap):
* gdk/win32/gdkwindow-win32.c (gdk_window_set_back_pixmap):
* gdk/x11/gdkwindow-x11.c (gdk_window_set_back_pixmap):
Handle pixmap == NULL when checking for a colormap.
(Allin Cottrell).
2005-08-14 Matthias Clasen <mclasen@redhat.com>
* gtk/updateiconcache.c: Store only one copy of the pixel data
......
2005-08-15 Owen Taylor <otaylor@redhat.com>
* gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_back_pixmap):
* gdk/win32/gdkwindow-win32.c (gdk_window_set_back_pixmap):
* gdk/x11/gdkwindow-x11.c (gdk_window_set_back_pixmap):
Handle pixmap == NULL when checking for a colormap.
(Allin Cottrell).
2005-08-14 Matthias Clasen <mclasen@redhat.com>
* gtk/updateiconcache.c: Store only one copy of the pixel data
......
2005-08-15 Owen Taylor <otaylor@redhat.com>
* gdk/linux-fb/gdkwindow-fb.c (gdk_window_set_back_pixmap):
* gdk/win32/gdkwindow-win32.c (gdk_window_set_back_pixmap):
* gdk/x11/gdkwindow-x11.c (gdk_window_set_back_pixmap):
Handle pixmap == NULL when checking for a colormap.
(Allin Cottrell).
2005-08-14 Matthias Clasen <mclasen@redhat.com>
* gtk/updateiconcache.c: Store only one copy of the pixel data
......
......@@ -1473,7 +1473,7 @@ gdk_window_set_back_pixmap (GdkWindow *window,
g_return_if_fail (pixmap == NULL || !parent_relative);
g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
if (!gdk_drawable_get_colormap (pixmap))
if (pixmap && !gdk_drawable_get_colormap (pixmap))
{
g_warning ("gdk_window_set_back_pixmap(): pixmap must have a colormap");
return;
......
......@@ -1849,7 +1849,7 @@ gdk_window_set_back_pixmap (GdkWindow *window,
g_return_if_fail (pixmap == NULL || !parent_relative);
g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
if (!gdk_drawable_get_colormap (pixmap))
if (pixmap && !gdk_drawable_get_colormap (pixmap))
{
g_warning ("gdk_window_set_back_pixmap(): pixmap must have a colormap");
return;
......
......@@ -2913,7 +2913,7 @@ gdk_window_set_back_pixmap (GdkWindow *window,
g_return_if_fail (pixmap == NULL || !parent_relative);
g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap));
if (!gdk_drawable_get_colormap (pixmap))
if (pixmap && !gdk_drawable_get_colormap (pixmap))
{
g_warning ("gdk_window_set_back_pixmap(): pixmap must have a colormap");
return;
......
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