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).

diff --git a/ChangeLog b/ChangeLog
index 926eb7137467f5c84e6ab67128037a1f0b9a3432..106f975b80bb8c1e57e2c4daaa3df3e01975056a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 926eb7137467f5c84e6ab67128037a1f0b9a3432..106f975b80bb8c1e57e2c4daaa3df3e01975056a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+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

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 926eb7137467f5c84e6ab67128037a1f0b9a3432..106f975b80bb8c1e57e2c4daaa3df3e01975056a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+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

diff --git a/gdk/linux-fb/gdkwindow-fb.c b/gdk/linux-fb/gdkwindow-fb.c
index 98183131b8ccee9cf172b32bbaac73204b31785f..bd0f5494df396570e1fb39ac8a0f26b938edd4da 100644 (file)
--- a/gdk/linux-fb/gdkwindow-fb.c
+++ b/gdk/linux-fb/gdkwindow-fb.c
@@ -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;

diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c
index 83513cf0f0394e97d66681831d94c458f9647d73..81d764cc40e5f6cf617bd021b4611f0a5366d67b 100644 (file)
--- a/gdk/win32/gdkwindow-win32.c
+++ b/gdk/win32/gdkwindow-win32.c
@@ -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;

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index b02c86d114d15f68dc98ede796c59d2033c4da83..5d2f5bc02b557fb8d94a1d1de8000ae2dfe280d7 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -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;