diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2007-01-30 18:36:44 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-01-30 18:36:44 +0000 |
| commit | 1a2274e7be388f6e1bf47dedf4f3e02c6c508e8d (patch) | |
| tree | f42d52e52937d201cccc63ff3f136dadad4e178d /gdk/x11 | |
| parent | 98170cf57e6cbdbab449f07f44b84e2ae7f560e3 (diff) | |
| download | gtk+-1a2274e7be388f6e1bf47dedf4f3e02c6c508e8d.tar.gz | |
Be more careful about toplevel possibly being NULL. (#402453, Sebastian
2007-01-30 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkwindow-x11.c (gdk_x11_window_move_to_current_desktop):
(gdk_x11_window_set_user_time): Be more careful about toplevel
possibly being NULL. (#402453, Sebastian Bacher)
svn path=/trunk/; revision=17236
Diffstat (limited to 'gdk/x11')
| -rw-r--r-- | gdk/x11/gdkwindow-x11.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 719ba01618..39b46a70a5 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -2020,6 +2020,10 @@ void gdk_x11_window_move_to_current_desktop (GdkWindow *window) { GdkToplevelX11 *toplevel; + + g_return_if_fail (GDK_IS_WINDOW (window)); + g_return_if_fail (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD); + toplevel = _gdk_x11_window_get_toplevel (window); if (toplevel->on_all_desktops) @@ -3785,6 +3789,7 @@ gdk_window_add_colormap_windows (GdkWindow *window) if (GDK_WINDOW_DESTROYED (window)) return; + toplevel = gdk_window_get_toplevel (window); old_windows = NULL; @@ -4236,7 +4241,8 @@ gdk_x11_window_set_user_time (GdkWindow *window, if (timestamp_long != GDK_CURRENT_TIME) display_x11->user_time = timestamp_long; - toplevel->user_time = timestamp_long; + if (toplevel) + toplevel->user_time = timestamp_long; } #define GDK_SELECTION_MAX_SIZE(display) \ |