From a0cd7079cc0632917d20e94add19f9cec66126fe Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 18 Jun 2002 23:37:05 +0000 Subject: [PATCH] Set the display. Tue Jun 18 19:38:08 2002 Owen Taylor * gdk/x11/gdkinput.c (_gdk_init_input_core): Set the display. * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix missing check for mv_resize == NULL. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gdk/x11/gdkinput.c | 5 +++++ gdk/x11/gdkwindow-x11.c | 2 +- 8 files changed, 54 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d107fe5a4d..93f25d1e0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jun 18 19:38:08 2002 Owen Taylor + + * gdk/x11/gdkinput.c (_gdk_init_input_core): Set the + display. + + * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix + missing check for mv_resize == NULL. + Tue Jun 18 19:30:25 2002 Owen Taylor * gtk/gtktreeview.c: Typo fix. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d107fe5a4d..93f25d1e0f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Tue Jun 18 19:38:08 2002 Owen Taylor + + * gdk/x11/gdkinput.c (_gdk_init_input_core): Set the + display. + + * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix + missing check for mv_resize == NULL. + Tue Jun 18 19:30:25 2002 Owen Taylor * gtk/gtktreeview.c: Typo fix. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index d107fe5a4d..93f25d1e0f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Tue Jun 18 19:38:08 2002 Owen Taylor + + * gdk/x11/gdkinput.c (_gdk_init_input_core): Set the + display. + + * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix + missing check for mv_resize == NULL. + Tue Jun 18 19:30:25 2002 Owen Taylor * gtk/gtktreeview.c: Typo fix. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d107fe5a4d..93f25d1e0f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Tue Jun 18 19:38:08 2002 Owen Taylor + + * gdk/x11/gdkinput.c (_gdk_init_input_core): Set the + display. + + * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix + missing check for mv_resize == NULL. + Tue Jun 18 19:30:25 2002 Owen Taylor * gtk/gtktreeview.c: Typo fix. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d107fe5a4d..93f25d1e0f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Tue Jun 18 19:38:08 2002 Owen Taylor + + * gdk/x11/gdkinput.c (_gdk_init_input_core): Set the + display. + + * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix + missing check for mv_resize == NULL. + Tue Jun 18 19:30:25 2002 Owen Taylor * gtk/gtktreeview.c: Typo fix. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d107fe5a4d..93f25d1e0f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Tue Jun 18 19:38:08 2002 Owen Taylor + + * gdk/x11/gdkinput.c (_gdk_init_input_core): Set the + display. + + * gdk/x11/gdkwindow-x11.c (_gdk_moveresize_handle_event): Fix + missing check for mv_resize == NULL. + Tue Jun 18 19:30:25 2002 Owen Taylor * gtk/gtktreeview.c: Typo fix. diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c index c78df5fcd6..01b74d5168 100644 --- a/gdk/x11/gdkinput.c +++ b/gdk/x11/gdkinput.c @@ -44,7 +44,10 @@ static GdkDeviceAxis gdk_input_core_axes[] = { void _gdk_init_input_core (GdkDisplay *display) { + GdkDevicePrivate *private; + display->core_pointer = g_object_new (GDK_TYPE_DEVICE, NULL); + private = (GdkDevicePrivate *)display->core_pointer; display->core_pointer->name = "Core Pointer"; display->core_pointer->source = GDK_SOURCE_MOUSE; @@ -54,6 +57,8 @@ _gdk_init_input_core (GdkDisplay *display) display->core_pointer->axes = gdk_input_core_axes; display->core_pointer->num_keys = 0; display->core_pointer->keys = NULL; + + private->display = display; } GType diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index ad53ae06f5..06d08c0154 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -4349,7 +4349,7 @@ _gdk_moveresize_handle_event (XEvent *event) GdkDisplay *display= gdk_x11_lookup_xdisplay (event->xany.display); MoveResizeData *mv_resize = get_move_resize_data (display, FALSE); - if (!mv_resize->moveresize_window) + if (!mv_resize || mv_resize->moveresize_window) return FALSE; window_private = (GdkWindowObject *) mv_resize->moveresize_window;