From bfdb15ff85024104354bd64624c324adfba640b4 Mon Sep 17 00:00:00 2001 From: Karl Tomlinson Date: Mon, 30 Nov 2009 09:54:04 +1300 Subject: [PATCH] b=530761 check toplevel window state in hierarchy_changed_cb r=roc --- widget/src/gtk2/nsWindow.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp index c57b42a66452..55a38b8b8113 100644 --- a/widget/src/gtk2/nsWindow.cpp +++ b/widget/src/gtk2/nsWindow.cpp @@ -5790,16 +5790,16 @@ hierarchy_changed_cb (GtkWidget *widget, g_signal_handlers_disconnect_by_func(previous_toplevel, FuncToGpointer(window_state_event_cb), widget); - if (widget->window) { - old_window_state = gdk_window_get_state(widget->window); + if (previous_toplevel->window) { + old_window_state = gdk_window_get_state(previous_toplevel->window); } } if (GTK_IS_WINDOW(toplevel)) { g_signal_connect_swapped(toplevel, "window-state-event", G_CALLBACK(window_state_event_cb), widget); - if (widget->window) { - event.new_window_state = gdk_window_get_state(widget->window); + if (toplevel->window) { + event.new_window_state = gdk_window_get_state(toplevel->window); } }