diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-04-25 16:17:46 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-04-25 16:17:46 +0000 |
| commit | 5dd0e3d6314c65ecc2c22a5bafb5980d931dc26f (patch) | |
| tree | 5602231c8e5c617380a1230d3eb2a18c9938bd96 /gdk | |
| parent | a48055e08c1bd6bfd5d179107762d63a1b1084d7 (diff) | |
| download | gtk+-5dd0e3d6314c65ecc2c22a5bafb5980d931dc26f.tar.gz | |
Test for window == NULL in a number of cases.
Wed Apr 25 12:16:36 2001 Owen Taylor <otaylor@redhat.com>
* gdk/X11/gdkevents-x11.c (gdk_event_translate): Test for
window == NULL in a number of cases.
* tests/testdnd.c: Set module path for gdk-pixbuf.
Diffstat (limited to 'gdk')
| -rw-r--r-- | gdk/x11/gdkevents-x11.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index 22eb7a3179..8767c33a70 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -756,7 +756,8 @@ gdk_event_translate (GdkEvent *event, xevent->xcrossing.subwindow)); /* Handle focusing (in the case where no window manager is running */ - if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && + if (window && + GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && xevent->xcrossing.detail != NotifyInferior && xevent->xcrossing.focus && !window_impl->has_focus) { @@ -842,7 +843,8 @@ gdk_event_translate (GdkEvent *event, xevent->xcrossing.detail, xevent->xcrossing.subwindow)); /* Handle focusing (in the case where no window manager is running */ - if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && + if (window && + GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD && xevent->xcrossing.detail != NotifyInferior && xevent->xcrossing.focus && !window_impl->has_focus) { @@ -922,7 +924,7 @@ gdk_event_translate (GdkEvent *event, GDK_NOTE (EVENTS, g_message ("focus in:\t\twindow: %ld", xevent->xfocus.window)); - if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD) + if (window && GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD) { gboolean had_focus = HAS_FOCUS (window_impl); @@ -951,7 +953,7 @@ gdk_event_translate (GdkEvent *event, GDK_NOTE (EVENTS, g_message ("focus out:\t\twindow: %ld", xevent->xfocus.window)); - if (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD) + if (window && GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD) { gboolean had_focus = HAS_FOCUS (window_impl); @@ -1155,7 +1157,7 @@ gdk_event_translate (GdkEvent *event, * an unmap, it means we hid the window ourselves, so we * will have already flipped the iconified bit off. */ - if (GDK_WINDOW_IS_MAPPED (window)) + if (window && GDK_WINDOW_IS_MAPPED (window)) gdk_synthesize_window_state (window, 0, GDK_WINDOW_STATE_ICONIFIED); @@ -1174,7 +1176,7 @@ gdk_event_translate (GdkEvent *event, event->any.window = window; /* Unset iconified if it was set */ - if (((GdkWindowObject*)window)->state & GDK_WINDOW_STATE_ICONIFIED) + if (window && (((GdkWindowObject*)window)->state & GDK_WINDOW_STATE_ICONIFIED)) gdk_synthesize_window_state (window, GDK_WINDOW_STATE_ICONIFIED, 0); |