diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-08-15 12:35:04 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-08-15 12:35:04 +0000 |
| commit | 42dc0241f39872aeccfa77dafa4552647b346622 (patch) | |
| tree | 748218ac9e20aa41d00cd2724fc1b17886c57dd0 | |
| parent | 7ab665262976e3e93507b9730ef939645634c6c9 (diff) | |
| download | gtk+-42dc0241f39872aeccfa77dafa4552647b346622.tar.gz | |
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).
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 8 | ||||
| -rw-r--r-- | gdk/linux-fb/gdkwindow-fb.c | 2 | ||||
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 2 | ||||
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 2 |
6 files changed, 27 insertions, 3 deletions
@@ -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 926eb71374..106f975b80 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 926eb71374..106f975b80 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 98183131b8..bd0f5494df 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 83513cf0f0..81d764cc40 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 b02c86d114..5d2f5bc02b 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; |