Pass the ref_node and unref_node calls through to the child model.

* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_ref_node),
	(gtk_tree_model_sort_unref_node): Pass the ref_node and
	unref_node calls through to the child model.
This commit is contained in:
Darin Adler 2002-02-08 17:13:14 +00:00
parent 54ddc51ec3
commit e0e8197e1c
8 changed files with 52 additions and 0 deletions

View File

@ -1,3 +1,9 @@
2002-02-08 Darin Adler <darin@bentspoon.com>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_ref_node),
(gtk_tree_model_sort_unref_node): Pass the ref_node and
unref_node calls through to the child model.
2002-02-08 Laszlo Peter <laca@ireland.sun.com> 2002-02-08 Laszlo Peter <laca@ireland.sun.com>
* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/ * gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/

View File

@ -1,3 +1,9 @@
2002-02-08 Darin Adler <darin@bentspoon.com>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_ref_node),
(gtk_tree_model_sort_unref_node): Pass the ref_node and
unref_node calls through to the child model.
2002-02-08 Laszlo Peter <laca@ireland.sun.com> 2002-02-08 Laszlo Peter <laca@ireland.sun.com>
* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/ * gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/

View File

@ -1,3 +1,9 @@
2002-02-08 Darin Adler <darin@bentspoon.com>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_ref_node),
(gtk_tree_model_sort_unref_node): Pass the ref_node and
unref_node calls through to the child model.
2002-02-08 Laszlo Peter <laca@ireland.sun.com> 2002-02-08 Laszlo Peter <laca@ireland.sun.com>
* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/ * gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/

View File

@ -1,3 +1,9 @@
2002-02-08 Darin Adler <darin@bentspoon.com>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_ref_node),
(gtk_tree_model_sort_unref_node): Pass the ref_node and
unref_node calls through to the child model.
2002-02-08 Laszlo Peter <laca@ireland.sun.com> 2002-02-08 Laszlo Peter <laca@ireland.sun.com>
* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/ * gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/

View File

@ -1,3 +1,9 @@
2002-02-08 Darin Adler <darin@bentspoon.com>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_ref_node),
(gtk_tree_model_sort_unref_node): Pass the ref_node and
unref_node calls through to the child model.
2002-02-08 Laszlo Peter <laca@ireland.sun.com> 2002-02-08 Laszlo Peter <laca@ireland.sun.com>
* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/ * gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/

View File

@ -1,3 +1,9 @@
2002-02-08 Darin Adler <darin@bentspoon.com>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_ref_node),
(gtk_tree_model_sort_unref_node): Pass the ref_node and
unref_node calls through to the child model.
2002-02-08 Laszlo Peter <laca@ireland.sun.com> 2002-02-08 Laszlo Peter <laca@ireland.sun.com>
* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/ * gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/

View File

@ -1,3 +1,9 @@
2002-02-08 Darin Adler <darin@bentspoon.com>
* gtk/gtktreemodelsort.c: (gtk_tree_model_sort_ref_node),
(gtk_tree_model_sort_unref_node): Pass the ref_node and
unref_node calls through to the child model.
2002-02-08 Laszlo Peter <laca@ireland.sun.com> 2002-02-08 Laszlo Peter <laca@ireland.sun.com>
* gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/ * gtk/gtktextchild.c: s/__FUNCTION__/G_GNUC_FUNCTION/

View File

@ -1091,6 +1091,7 @@ gtk_tree_model_sort_ref_node (GtkTreeModel *tree_model,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model; GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
GtkTreeIter child_iter;
SortLevel *level; SortLevel *level;
SortElt *elt; SortElt *elt;
@ -1098,6 +1099,10 @@ gtk_tree_model_sort_ref_node (GtkTreeModel *tree_model,
g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->child_model != NULL); g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->child_model != NULL);
g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->stamp == iter->stamp); g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->stamp == iter->stamp);
GET_CHILD_ITER (tree_model, &child_iter, iter);
gtk_tree_model_ref_node (GTK_TREE_MODEL_SORT (tree_model)->child_model, &child_iter);
level = iter->user_data; level = iter->user_data;
elt = iter->user_data2; elt = iter->user_data2;
@ -1130,6 +1135,7 @@ gtk_tree_model_sort_unref_node (GtkTreeModel *tree_model,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model; GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
GtkTreeIter child_iter;
SortLevel *level; SortLevel *level;
SortElt *elt; SortElt *elt;
@ -1137,6 +1143,10 @@ gtk_tree_model_sort_unref_node (GtkTreeModel *tree_model,
g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->child_model != NULL); g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->child_model != NULL);
g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->stamp == iter->stamp); g_return_if_fail (GTK_TREE_MODEL_SORT (tree_model)->stamp == iter->stamp);
GET_CHILD_ITER (tree_model, &child_iter, iter);
gtk_tree_model_unref_node (GTK_TREE_MODEL_SORT (tree_model)->child_model, &child_iter);
level = iter->user_data; level = iter->user_data;
elt = iter->user_data2; elt = iter->user_data2;