diff --git a/ChangeLog b/ChangeLog index 86c25e8d2c..124db9050c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Apr 18 17:14:33 2003 Owen Taylor + + * gdk/gdkevents.c (gdk_event_copy): Fix for the + case when gdk_event_copy() is called on a non-allocated + event. (#109716, reported by Rich Burridge) + Fri Apr 18 16:57:44 2003 Owen Taylor * gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 86c25e8d2c..124db9050c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Apr 18 17:14:33 2003 Owen Taylor + + * gdk/gdkevents.c (gdk_event_copy): Fix for the + case when gdk_event_copy() is called on a non-allocated + event. (#109716, reported by Rich Burridge) + Fri Apr 18 16:57:44 2003 Owen Taylor * gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 86c25e8d2c..124db9050c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Apr 18 17:14:33 2003 Owen Taylor + + * gdk/gdkevents.c (gdk_event_copy): Fix for the + case when gdk_event_copy() is called on a non-allocated + event. (#109716, reported by Rich Burridge) + Fri Apr 18 16:57:44 2003 Owen Taylor * gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 86c25e8d2c..124db9050c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Apr 18 17:14:33 2003 Owen Taylor + + * gdk/gdkevents.c (gdk_event_copy): Fix for the + case when gdk_event_copy() is called on a non-allocated + event. (#109716, reported by Rich Burridge) + Fri Apr 18 16:57:44 2003 Owen Taylor * gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 86c25e8d2c..124db9050c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Apr 18 17:14:33 2003 Owen Taylor + + * gdk/gdkevents.c (gdk_event_copy): Fix for the + case when gdk_event_copy() is called on a non-allocated + event. (#109716, reported by Rich Burridge) + Fri Apr 18 16:57:44 2003 Owen Taylor * gdk/x11/gdkdrawable-x11.c (draw_with_images/pixmaps): diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 65ccee5e24..a299d2ce2b 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -363,7 +363,6 @@ gdk_event_is_allocated (GdkEvent *event) GdkEvent* gdk_event_copy (GdkEvent *event) { - GdkEventPrivate *private; GdkEventPrivate *new_private; GdkEvent *new_event; @@ -372,13 +371,16 @@ gdk_event_copy (GdkEvent *event) new_event = gdk_event_new (GDK_NOTHING); new_private = (GdkEventPrivate *)new_event; - private = (GdkEventPrivate *)event; - *new_event = *event; if (new_event->any.window) g_object_ref (new_event->any.window); - new_private->screen = private->screen; + if (gdk_event_is_allocated (event)) + { + GdkEventPrivate *private = (GdkEventPrivate *)event; + + new_private->screen = private->screen; + } switch (event->any.type) {