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.

diff --git a/ChangeLog b/ChangeLog
index b834eae76f8d15600e0a88ce8155ef07654a8870..0ca6226039bdb4647cf58c80f1a7f248fd56bbda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b834eae76f8d15600e0a88ce8155ef07654a8870..0ca6226039bdb4647cf58c80f1a7f248fd56bbda 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -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,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b834eae76f8d15600e0a88ce8155ef07654a8870..0ca6226039bdb4647cf58c80f1a7f248fd56bbda 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b834eae76f8d15600e0a88ce8155ef07654a8870..0ca6226039bdb4647cf58c80f1a7f248fd56bbda 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b834eae76f8d15600e0a88ce8155ef07654a8870..0ca6226039bdb4647cf58c80f1a7f248fd56bbda 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b834eae76f8d15600e0a88ce8155ef07654a8870..0ca6226039bdb4647cf58c80f1a7f248fd56bbda 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b834eae76f8d15600e0a88ce8155ef07654a8870..0ca6226039bdb4647cf58c80f1a7f248fd56bbda 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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,

diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index 4f03ff8de33d30ecd058a3d34735acc597e72d82..1ce5ca1d8a8e7c47fa2160cbf7654ec1da23d933 100644 (file)
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -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.
        */