diff --git a/ChangeLog b/ChangeLog index cc1025cd1a..ec62827655 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 27 16:19:59 2003 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): event->any.window + might be NULL. Use gtk_widget_get_display (widget) + (#102860, Thomas Leonard) + Mon Jan 27 15:58:31 2003 Owen Taylor * configure.in: Fix --without-modules/--disable-modules diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index cc1025cd1a..ec62827655 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Mon Jan 27 16:19:59 2003 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): event->any.window + might be NULL. Use gtk_widget_get_display (widget) + (#102860, Thomas Leonard) + Mon Jan 27 15:58:31 2003 Owen Taylor * configure.in: Fix --without-modules/--disable-modules diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index cc1025cd1a..ec62827655 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Mon Jan 27 16:19:59 2003 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): event->any.window + might be NULL. Use gtk_widget_get_display (widget) + (#102860, Thomas Leonard) + Mon Jan 27 15:58:31 2003 Owen Taylor * configure.in: Fix --without-modules/--disable-modules diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index cc1025cd1a..ec62827655 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Mon Jan 27 16:19:59 2003 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): event->any.window + might be NULL. Use gtk_widget_get_display (widget) + (#102860, Thomas Leonard) + Mon Jan 27 15:58:31 2003 Owen Taylor * configure.in: Fix --without-modules/--disable-modules diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index cc1025cd1a..ec62827655 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Mon Jan 27 16:19:59 2003 Owen Taylor + + * gtk/gtksocket.c (gtk_socket_filter_func): event->any.window + might be NULL. Use gtk_widget_get_display (widget) + (#102860, Thomas Leonard) + Mon Jan 27 15:58:31 2003 Owen Taylor * configure.in: Fix --without-modules/--disable-modules diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c index e2b488df76..b31c34341d 100644 --- a/gtk/gtksocket.c +++ b/gtk/gtksocket.c @@ -1229,7 +1229,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data) socket = GTK_SOCKET (data); widget = GTK_WIDGET (socket); xevent = (XEvent *)gdk_xevent; - display = gdk_drawable_get_display (event->any.window); + display = gtk_widget_get_display (widget); return_val = GDK_FILTER_CONTINUE;