aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4b9ccbb..a11ad98 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-22 Thomas Fitzsimmons <fitzsim@redhat.com>
+
+ * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
+ (pre_event_handler): Don't dereference NULL focus_obj_ptr.
+
2003-12-21 Michael Koch <konqueror@gmx.de>
* javax/print/attribute/AttributeSetUtilities.java,
diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
index b158e62..aa9fd17b 100644
--- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
+++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
@@ -1043,7 +1043,7 @@ pre_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer)
/* A widget with a grab will get key events */
if (!GTK_IS_WINDOW (widget))
- *focus_obj_ptr = peer;
+ focus_obj_ptr = &peer;
else
{
GtkWindow *window;