Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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)
This commit is contained in:
Matthias Clasen
2004-07-15 16:57:53 +00:00
committed by Matthias Clasen
parent af554cb133
commit 323dffbc3b
5 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
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>
Merged from HEAD:

6
ChangeLog.pre-2-10
View File

@@ -1,3 +1,9 @@
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>
Merged from HEAD:

6
ChangeLog.pre-2-6
View File

@@ -1,3 +1,9 @@
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>
Merged from HEAD:

6
ChangeLog.pre-2-8
View File

@@ -1,3 +1,9 @@
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>
Merged from HEAD:

3
gtk/gtkmenu.c
View File

@@ -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;