AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Don't crash on duplicate destroy. (#318953, Gustavo Carneiro)

Browse Source 
2005-10-26  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't crash
	on duplicate destroy.  (#318953, Gustavo Carneiro)
This commit is contained in:
Matthias Clasen 2005-10-26 19:47:48 +00:00 committed by Matthias Clasen
parent 60ec536ce3
commit ec76057b9b
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2005-10-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't crash
on duplicate destroy. (#318953, Gustavo Carneiro)
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog):
Point out that destroy-with-parent is a bad idea for the dialog
passed to this function. (#318943, Christian Persch)

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
2005-10-26 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't crash
on duplicate destroy. (#318953, Gustavo Carneiro)
* gtk/gtkfilechooserbutton.c (gtk_file_chooser_button_new_with_dialog):
Point out that destroy-with-parent is a bad idea for the dialog
passed to this function. (#318943, Christian Persch)

4
gtk/gtktreeview.c
View File

@ -1408,13 +1408,13 @@ gtk_tree_view_destroy (GtkObject *object)
}
}
if (tree_view->priv->search_destroy)
if (tree_view->priv->search_destroy && tree_view->priv->search_user_data)
{
(* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);
tree_view->priv->search_user_data = NULL;
}
if (tree_view->priv->row_separator_destroy)
if (tree_view->priv->row_separator_destroy && tree_view->priv->row_separator_data)
{
(* tree_view->priv->row_separator_destroy) (tree_view->priv->row_separator_data);
tree_view->priv->row_separator_data = NULL;