From 3eaf016542f9537612da39fcdddebcd9d9d4da30 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 30 Jan 2007 18:39:01 +0000 Subject: [PATCH] Be more careful about toplevel possibly being NULL. (#402453, Sebastian 2007-01-30 Matthias Clasen * 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=/branches/gtk-2-10/; revision=17237 --- ChangeLog | 6 ++++++ gdk/x11/gdkwindow-x11.c | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e473ccb1e6..56df824a49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-30 Matthias Clasen + + * 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) + 2007-01-26 Michael Natterer Merge from trunk: diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 95877ddb17..1654090df9 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -2016,6 +2016,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) @@ -3781,6 +3785,7 @@ gdk_window_add_colormap_windows (GdkWindow *window) if (GDK_WINDOW_DESTROYED (window)) return; + toplevel = gdk_window_get_toplevel (window); old_windows = NULL; @@ -4232,7 +4237,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) \