callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

when (un)reffing an element, also (un)ref its parent elements. (Fixes

Browse Source 
2007-03-10  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_ref_node),
	(gtk_tree_model_sort_real_unref_node): when (un)reffing an
	element, also (un)ref its parent elements. (Fixes #364946,
	reported by many, testcase by Andreas Koehler).


svn path=/trunk/; revision=17457
This commit is contained in:
Kristian Rietveld
2007-03-10 17:25:51 +00:00
committed by Kristian Rietveld
parent ef6f4ca81f
commit b1285c3fe6
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2007-03-10 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_ref_node),
(gtk_tree_model_sort_real_unref_node): when (un)reffing an
element, also (un)ref its parent elements. (Fixes #364946,
reported by many, testcase by Andreas Koehler).
2007-03-10 Matthias Clasen <mclasen@redhat.com> 2007-03-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkprintoperation-unix.c: Initialize the do_preview * gtk/gtkprintoperation-unix.c: Initialize the do_preview

31
gtk/gtktreemodelsort.c
View File

@ -1172,6 +1172,7 @@ gtk_tree_model_sort_ref_node (GtkTreeModel *tree_model,
{ {
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model; GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
GtkTreeIter child_iter; GtkTreeIter child_iter;
GtkTreeIter tmp_iter;
SortLevel *level; SortLevel *level;
SortElt *elt; SortElt *elt;
@ -1180,13 +1181,29 @@ gtk_tree_model_sort_ref_node (GtkTreeModel *tree_model,
GET_CHILD_ITER (tree_model_sort, &child_iter, iter); GET_CHILD_ITER (tree_model_sort, &child_iter, iter);
/* Reference the node in the child model */
gtk_tree_model_ref_node (tree_model_sort->child_model, &child_iter); gtk_tree_model_ref_node (tree_model_sort->child_model, &child_iter);
/* Increase the reference count of this element and its level */
level = iter->user_data; level = iter->user_data;
elt = iter->user_data2; elt = iter->user_data2;
elt->ref_count++; elt->ref_count++;
level->ref_count++; level->ref_count++;
/* Increase the reference count of all parent elements */
tmp_iter.stamp = tree_model_sort->stamp;
tmp_iter.user_data = level->parent_level;
tmp_iter.user_data2 = level->parent_elt;;
while (tmp_iter.user_data2)
{
gtk_tree_model_sort_ref_node (tree_model, &tmp_iter);
tmp_iter.user_data2 = SORT_LEVEL (tmp_iter.user_data)->parent_elt;
tmp_iter.user_data = SORT_LEVEL (tmp_iter.user_data)->parent_level;
}
if (level->ref_count == 1) if (level->ref_count == 1)
{ {
SortLevel *parent_level = level->parent_level; SortLevel *parent_level = level->parent_level;
@ -1211,6 +1228,7 @@ gtk_tree_model_sort_real_unref_node (GtkTreeModel *tree_model,
gboolean propagate_unref) gboolean propagate_unref)
{ {
GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model; GtkTreeModelSort *tree_model_sort = (GtkTreeModelSort *) tree_model;
GtkTreeIter tmp_iter;
SortLevel *level; SortLevel *level;
SortElt *elt; SortElt *elt;
@ -1233,6 +1251,19 @@ gtk_tree_model_sort_real_unref_node (GtkTreeModel *tree_model,
elt->ref_count--; elt->ref_count--;
level->ref_count--; level->ref_count--;
/* Decrease the reference count of all parent elements */
tmp_iter.stamp = tree_model_sort->stamp;
tmp_iter.user_data = level->parent_level;
tmp_iter.user_data2 = level->parent_elt;;
while (tmp_iter.user_data2)
{
gtk_tree_model_sort_real_unref_node (tree_model, &tmp_iter, FALSE);
tmp_iter.user_data2 = SORT_LEVEL (tmp_iter.user_data)->parent_elt;
tmp_iter.user_data = SORT_LEVEL (tmp_iter.user_data)->parent_level;
}
if (level->ref_count == 0) if (level->ref_count == 0)
{ {
SortLevel *parent_level = level->parent_level; SortLevel *parent_level = level->parent_level;