Properly handle gc->clip_region == NULL>

Thu Nov 30 23:03:04 2000  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle
	gc->clip_region == NULL>

diff --git a/ChangeLog b/ChangeLog
index 496daace73bf486473b34394f03dc89f45b114c7..16a0cc3094073c587b7845e9417d51b9f93169ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 30 23:03:04 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle
+       gc->clip_region == NULL>
+
 2000-11-30  Tor Lillqvist  <tml@iki.fi>
 
        Changes by Hans Breuer:
@@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000  Owen Taylor  <otaylor@redhat.com>
         - completion on files in home directory didn't work
         - completion on an empty string caused  segfault
 
-        (Bug #3768, reported by Steve Ratcliffe)
+        (Bug #3678, reported by Steve Ratcliffe)
 
        * gtk/gtkscale.c (gtk_scale_get_value_width): Fix
        cut and paste error that was causing scales to

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 496daace73bf486473b34394f03dc89f45b114c7..16a0cc3094073c587b7845e9417d51b9f93169ff 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Nov 30 23:03:04 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle
+       gc->clip_region == NULL>
+
 2000-11-30  Tor Lillqvist  <tml@iki.fi>
 
        Changes by Hans Breuer:
@@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000  Owen Taylor  <otaylor@redhat.com>
         - completion on files in home directory didn't work
         - completion on an empty string caused  segfault
 
-        (Bug #3768, reported by Steve Ratcliffe)
+        (Bug #3678, reported by Steve Ratcliffe)
 
        * gtk/gtkscale.c (gtk_scale_get_value_width): Fix
        cut and paste error that was causing scales to

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 496daace73bf486473b34394f03dc89f45b114c7..16a0cc3094073c587b7845e9417d51b9f93169ff 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Nov 30 23:03:04 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle
+       gc->clip_region == NULL>
+
 2000-11-30  Tor Lillqvist  <tml@iki.fi>
 
        Changes by Hans Breuer:
@@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000  Owen Taylor  <otaylor@redhat.com>
         - completion on files in home directory didn't work
         - completion on an empty string caused  segfault
 
-        (Bug #3768, reported by Steve Ratcliffe)
+        (Bug #3678, reported by Steve Ratcliffe)
 
        * gtk/gtkscale.c (gtk_scale_get_value_width): Fix
        cut and paste error that was causing scales to

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 496daace73bf486473b34394f03dc89f45b114c7..16a0cc3094073c587b7845e9417d51b9f93169ff 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Nov 30 23:03:04 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle
+       gc->clip_region == NULL>
+
 2000-11-30  Tor Lillqvist  <tml@iki.fi>
 
        Changes by Hans Breuer:
@@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000  Owen Taylor  <otaylor@redhat.com>
         - completion on files in home directory didn't work
         - completion on an empty string caused  segfault
 
-        (Bug #3768, reported by Steve Ratcliffe)
+        (Bug #3678, reported by Steve Ratcliffe)
 
        * gtk/gtkscale.c (gtk_scale_get_value_width): Fix
        cut and paste error that was causing scales to

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 496daace73bf486473b34394f03dc89f45b114c7..16a0cc3094073c587b7845e9417d51b9f93169ff 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Nov 30 23:03:04 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle
+       gc->clip_region == NULL>
+
 2000-11-30  Tor Lillqvist  <tml@iki.fi>
 
        Changes by Hans Breuer:
@@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000  Owen Taylor  <otaylor@redhat.com>
         - completion on files in home directory didn't work
         - completion on an empty string caused  segfault
 
-        (Bug #3768, reported by Steve Ratcliffe)
+        (Bug #3678, reported by Steve Ratcliffe)
 
        * gtk/gtkscale.c (gtk_scale_get_value_width): Fix
        cut and paste error that was causing scales to

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 496daace73bf486473b34394f03dc89f45b114c7..16a0cc3094073c587b7845e9417d51b9f93169ff 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Nov 30 23:03:04 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle
+       gc->clip_region == NULL>
+
 2000-11-30  Tor Lillqvist  <tml@iki.fi>
 
        Changes by Hans Breuer:
@@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000  Owen Taylor  <otaylor@redhat.com>
         - completion on files in home directory didn't work
         - completion on an empty string caused  segfault
 
-        (Bug #3768, reported by Steve Ratcliffe)
+        (Bug #3678, reported by Steve Ratcliffe)
 
        * gtk/gtkscale.c (gtk_scale_get_value_width): Fix
        cut and paste error that was causing scales to

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 496daace73bf486473b34394f03dc89f45b114c7..16a0cc3094073c587b7845e9417d51b9f93169ff 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Nov 30 23:03:04 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (gdk_gc_copy): Properly handle
+       gc->clip_region == NULL>
+
 2000-11-30  Tor Lillqvist  <tml@iki.fi>
 
        Changes by Hans Breuer:
@@ -6157,7 +6162,7 @@ Wed Jan 26 19:01:56 2000  Owen Taylor  <otaylor@redhat.com>
         - completion on files in home directory didn't work
         - completion on an empty string caused  segfault
 
-        (Bug #3768, reported by Steve Ratcliffe)
+        (Bug #3678, reported by Steve Ratcliffe)
 
        * gtk/gtkscale.c (gtk_scale_get_value_width): Fix
        cut and paste error that was causing scales to

diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c
index 0f78a853e31e3d341e0027bafbbb5d347a8e20fc..ad3dc65caac084fa3280325c72b3433a954000c8 100644 (file)
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.c
@@ -711,7 +711,10 @@ gdk_gc_copy (GdkGC *dst_gc, GdkGC *src_gc)
   if (x11_dst_gc->clip_region)
     gdk_region_destroy (x11_dst_gc->clip_region);
 
-  x11_dst_gc->clip_region = gdk_region_copy (x11_src_gc->clip_region);
+  if (x11_src_gc->clip_region)
+    x11_dst_gc->clip_region = gdk_region_copy (x11_src_gc->clip_region);
+  else
+    x11_dst_gc->clip_region = NULL;
 
   x11_dst_gc->dirty_mask = x11_src_gc->dirty_mask;
 }