summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--ChangeLog.pre-2-108
-rw-r--r--ChangeLog.pre-2-88
-rw-r--r--gdk/linux-fb/gdkwindow-fb.c2
-rw-r--r--gdk/win32/gdkwindow-win32.c2
-rw-r--r--gdk/x11/gdkwindow-x11.c2
6 files changed, 27 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 926eb7137..106f975b8 100644
--- 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 926eb7137..106f975b8 100644
--- 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 926eb7137..106f975b8 100644
--- 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 98183131b..bd0f5494d 100644
--- 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 83513cf0f..81d764cc4 100644
--- 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 b02c86d11..5d2f5bc02 100644
--- 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;