Don't reparent back to menu->toplevel if it is already gone because we're

2004-07-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Don't reparent
	back to menu->toplevel if it is already gone because we're
	shutting down.  (#147656, John Cupitt)

ChangeLog

+2004-07-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Don't reparent
+	back to menu->toplevel if it is already gone because we're
+	shutting down.  (#147656, John Cupitt)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #126295:

ChangeLog.pre-2-10

+2004-07-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Don't reparent
+	back to menu->toplevel if it is already gone because we're
+	shutting down.  (#147656, John Cupitt)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #126295:

ChangeLog.pre-2-6

+2004-07-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Don't reparent
+	back to menu->toplevel if it is already gone because we're
+	shutting down.  (#147656, John Cupitt)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #126295:

ChangeLog.pre-2-8

+2004-07-15  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkmenu.c (gtk_menu_set_tearoff_state): Don't reparent
+	back to menu->toplevel if it is already gone because we're
+	shutting down.  (#147656, John Cupitt)
+
 2004-07-14  Federico Mena Quintero  <federico@ximian.com>
 
 	Fix #126295:

gtk/gtkmenu.c

@@ -1861,7 +1861,8 @@ gtk_menu_set_tearoff_state (GtkMenu  *menu,
 	{
 	  gtk_widget_hide (GTK_WIDGET (menu));
 	  gtk_widget_hide (menu->tearoff_window);
-	  gtk_menu_reparent (menu, menu->toplevel, FALSE);
+	  if (GTK_IS_CONTAINER (menu->toplevel))
+	    gtk_menu_reparent (menu, menu->toplevel, FALSE);
 	  gtk_widget_destroy (menu->tearoff_window);
 	  
 	  menu->tearoff_window = NULL;