AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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).
This commit is contained in:
Owen Taylor 2005-08-15 12:35:04 +00:00 committed by Owen Taylor
parent 7ab6652629
commit 42dc0241f3
6 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> 2005-08-14 Matthias Clasen <mclasen@redhat.com>
* gtk/updateiconcache.c: Store only one copy of the pixel data * gtk/updateiconcache.c: Store only one copy of the pixel data

8
ChangeLog.pre-2-10
View File

@ -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> 2005-08-14 Matthias Clasen <mclasen@redhat.com>
* gtk/updateiconcache.c: Store only one copy of the pixel data * gtk/updateiconcache.c: Store only one copy of the pixel data

8
ChangeLog.pre-2-8
View File

@ -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> 2005-08-14 Matthias Clasen <mclasen@redhat.com>
* gtk/updateiconcache.c: Store only one copy of the pixel data * gtk/updateiconcache.c: Store only one copy of the pixel data

2
gdk/linux-fb/gdkwindow-fb.c
View File

@ -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 || !parent_relative);
g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap)); 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"); g_warning ("gdk_window_set_back_pixmap(): pixmap must have a colormap");
return; return;

2
gdk/win32/gdkwindow-win32.c
View File

@ -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 || !parent_relative);
g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap)); 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"); g_warning ("gdk_window_set_back_pixmap(): pixmap must have a colormap");
return; return;

2
gdk/x11/gdkwindow-x11.c
View File

@ -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 || !parent_relative);
g_return_if_fail (pixmap == NULL || gdk_drawable_get_depth (window) == gdk_drawable_get_depth (pixmap)); 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"); g_warning ("gdk_window_set_back_pixmap(): pixmap must have a colormap");
return; return;