mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-25 05:01:09 +00:00
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.
This commit is contained in:
parent
44047a30e2
commit
bc5dfe106d
@ -1,3 +1,9 @@
|
||||
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
|
||||
|
@ -1,3 +1,9 @@
|
||||
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
|
||||
|
@ -1,3 +1,9 @@
|
||||
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
|
||||
|
@ -1,3 +1,9 @@
|
||||
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
|
||||
|
@ -1,3 +1,9 @@
|
||||
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
|
||||
|
@ -1,3 +1,9 @@
|
||||
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
|
||||
|
@ -1,3 +1,9 @@
|
||||
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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user