Commit bc5dfe10 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Don't clear the model until we clean up all the other objects that might

Thu Jan 24 11:53:19 2002  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
	the model until we clean up all the other objects
	that might refer to the object.
parent 44047a30
Thu Jan 24 11:53:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
the model until we clean up all the other objects
that might refer to the object.
2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h
......
Thu Jan 24 11:53:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
the model until we clean up all the other objects
that might refer to the object.
2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h
......
Thu Jan 24 11:53:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
the model until we clean up all the other objects
that might refer to the object.
2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h
......
Thu Jan 24 11:53:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
the model until we clean up all the other objects
that might refer to the object.
2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h
......
Thu Jan 24 11:53:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
the model until we clean up all the other objects
that might refer to the object.
2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h
......
Thu Jan 24 11:53:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
the model until we clean up all the other objects
that might refer to the object.
2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h
......
Thu Jan 24 11:53:19 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
the model until we clean up all the other objects
that might refer to the object.
2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h
......
......@@ -1050,8 +1050,6 @@ gtk_tree_view_destroy (GtkObject *object)
tree_view->priv->columns = NULL;
}
gtk_tree_view_set_model (tree_view, NULL);
if (tree_view->priv->tree != NULL)
{
gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree);
......@@ -1059,12 +1057,6 @@ gtk_tree_view_destroy (GtkObject *object)
tree_view->priv->tree = NULL;
}
if (tree_view->priv->model != NULL)
{
g_object_unref (G_OBJECT (tree_view->priv->model));
tree_view->priv->model = NULL;
}
if (tree_view->priv->selection != NULL)
{
_gtk_tree_selection_set_tree_view (tree_view->priv->selection, NULL);
......@@ -1122,6 +1114,9 @@ gtk_tree_view_destroy (GtkObject *object)
(* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);
tree_view->priv->search_user_data = NULL;
}
gtk_tree_view_set_model (tree_view, NULL);
if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment