From 323dffbc3b36952601cebe49878995169797dfdf Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 15 Jul 2004 16:57:53 +0000 Subject: [PATCH] Don't reparent back to menu->toplevel if it is already gone because we're 2004-07-15 Matthias Clasen * 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 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkmenu.c | 3 ++- 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6af49ae49f..e4bb15d996 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-07-15 Matthias Clasen + + * 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 Merged from HEAD: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6af49ae49f..e4bb15d996 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-07-15 Matthias Clasen + + * 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 Merged from HEAD: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6af49ae49f..e4bb15d996 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-07-15 Matthias Clasen + + * 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 Merged from HEAD: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6af49ae49f..e4bb15d996 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-07-15 Matthias Clasen + + * 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 Merged from HEAD: diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index fdf24290a6..4af7dc8eec 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -1824,7 +1824,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;