AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-25 21:21:21 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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:
Owen Taylor 2002-01-24 16:54:54 +00:00 committed by Owen Taylor
parent 44047a30e2
commit bc5dfe106d
8 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h * gtk/gtkaccessible.h: include gtk/gtkwidget.h

6
ChangeLog.pre-2-0
View File

@ -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> 2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h * gtk/gtkaccessible.h: include gtk/gtkwidget.h

6
ChangeLog.pre-2-10
View File

@ -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> 2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h * gtk/gtkaccessible.h: include gtk/gtkwidget.h

6
ChangeLog.pre-2-2
View File

@ -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> 2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h * gtk/gtkaccessible.h: include gtk/gtkwidget.h

6
ChangeLog.pre-2-4
View File

@ -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> 2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h * gtk/gtkaccessible.h: include gtk/gtkwidget.h

6
ChangeLog.pre-2-6
View File

@ -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> 2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h * gtk/gtkaccessible.h: include gtk/gtkwidget.h

6
ChangeLog.pre-2-8
View File

@ -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> 2002-01-24 Mark McLoughlin <mark@skynet.ie>
* gtk/gtkaccessible.h: include gtk/gtkwidget.h * gtk/gtkaccessible.h: include gtk/gtkwidget.h

11
gtk/gtktreeview.c
View File

@ -1050,8 +1050,6 @@ gtk_tree_view_destroy (GtkObject *object)
tree_view->priv->columns = NULL; tree_view->priv->columns = NULL;
} }
gtk_tree_view_set_model (tree_view, NULL);
if (tree_view->priv->tree != NULL) if (tree_view->priv->tree != NULL)
{ {
gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree); 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; 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) if (tree_view->priv->selection != NULL)
{ {
_gtk_tree_selection_set_tree_view (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_destroy) (tree_view->priv->search_user_data);
tree_view->priv->search_user_data = NULL; tree_view->priv->search_user_data = NULL;
} }
gtk_tree_view_set_model (tree_view, NULL);
if (GTK_OBJECT_CLASS (parent_class)->destroy) if (GTK_OBJECT_CLASS (parent_class)->destroy)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object); (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
} }