fixed a segfault that showed up when using the color picker.

2002-01-29  Sven Neumann  <sven@gimp.org>

	* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault
	that showed up when using the color picker.
This commit is contained in:
Sven Neumann 2002-01-29 11:47:15 +00:00 committed by Sven Neumann
parent c8a1ae5bce
commit 2c0e16e403
8 changed files with 37 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2002-01-29 Sven Neumann <sven@gimp.org>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault
that showed up when using the color picker.
Tue Jan 29 11:51:14 2002 Tim Janik <timj@gtk.org>
* gtk/gtkscale.[hc]: fix default value for ::digits property,

View File

@ -1,3 +1,8 @@
2002-01-29 Sven Neumann <sven@gimp.org>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault
that showed up when using the color picker.
Tue Jan 29 11:51:14 2002 Tim Janik <timj@gtk.org>
* gtk/gtkscale.[hc]: fix default value for ::digits property,

View File

@ -1,3 +1,8 @@
2002-01-29 Sven Neumann <sven@gimp.org>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault
that showed up when using the color picker.
Tue Jan 29 11:51:14 2002 Tim Janik <timj@gtk.org>
* gtk/gtkscale.[hc]: fix default value for ::digits property,

View File

@ -1,3 +1,8 @@
2002-01-29 Sven Neumann <sven@gimp.org>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault
that showed up when using the color picker.
Tue Jan 29 11:51:14 2002 Tim Janik <timj@gtk.org>
* gtk/gtkscale.[hc]: fix default value for ::digits property,

View File

@ -1,3 +1,8 @@
2002-01-29 Sven Neumann <sven@gimp.org>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault
that showed up when using the color picker.
Tue Jan 29 11:51:14 2002 Tim Janik <timj@gtk.org>
* gtk/gtkscale.[hc]: fix default value for ::digits property,

View File

@ -1,3 +1,8 @@
2002-01-29 Sven Neumann <sven@gimp.org>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault
that showed up when using the color picker.
Tue Jan 29 11:51:14 2002 Tim Janik <timj@gtk.org>
* gtk/gtkscale.[hc]: fix default value for ::digits property,

View File

@ -1,3 +1,8 @@
2002-01-29 Sven Neumann <sven@gimp.org>
* gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault
that showed up when using the color picker.
Tue Jan 29 11:51:14 2002 Tim Janik <timj@gtk.org>
* gtk/gtkscale.[hc]: fix default value for ::digits property,

View File

@ -584,8 +584,6 @@ _gdk_x11_copy_to_image (GdkDrawable *drawable,
if (!gdk_rectangle_intersect (&req, &window_rect, &req))
goto out;
private = PRIVATE_DATA (image);
gdk_error_trap_push ();
if (!image &&
@ -606,6 +604,8 @@ _gdk_x11_copy_to_image (GdkDrawable *drawable,
created_image = TRUE;
}
private = PRIVATE_DATA (image);
/* In the ShmImage but no ShmPixmap case, we could use XShmGetImage when
* we are getting the entire image.
*/