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

Bug 485218 - Strange warning encountered

Browse Source 
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted):
        (gtk_tree_model_sort_convert_child_iter_to_iter):
        (gtk_tree_model_sort_build_level): Better warnings. Patch
        by Kristian Rietveld.


svn path=/trunk/; revision=20198
This commit is contained in:
Matthias Clasen
2008-05-27 23:16:06 +00:00
parent 2855f81636
commit ea9c6f301d
2 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,6 +1,15 @@
2008-05-27 Matthias Clasen <mclasen@redhat.com> 2008-05-27 Matthias Clasen <mclasen@redhat.com>
Bug 351910 – Search column setting lost Bug 485218 - Strange warning encountered
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_row_inserted):
(gtk_tree_model_sort_convert_child_iter_to_iter):
(gtk_tree_model_sort_build_level): Better warnings. Patch
by Kristian Rietveld.
2008-05-27 Matthias Clasen <mclasen@redhat.com>
Bug 351910 - Search column setting lost
* gtk/gtktreeview.c (gtk_tree_view_set_search_column): Clarify * gtk/gtktreeview.c (gtk_tree_view_set_search_column): Clarify
the docs. Patch by Matt Barnes. the docs. Patch by Matt Barnes.

37
gtk/gtktreemodelsort.c
View File

@ -630,9 +630,10 @@ gtk_tree_model_sort_row_inserted (GtkTreeModel *s_model,
if (level->array->len < gtk_tree_path_get_indices (s_path)[i]) if (level->array->len < gtk_tree_path_get_indices (s_path)[i])
{ {
g_warning ("A node was inserted with a parent that's not in the tree.\n" g_warning ("%s: A node was inserted with a parent that's not in the tree.\n"
"This possibly means that a GtkTreeModel inserted a child node\n" "This possibly means that a GtkTreeModel inserted a child node\n"
"before the parent was inserted."); "before the parent was inserted.",
G_STRLOC);
goto done; goto done;
} }
@ -2080,7 +2081,12 @@ gtk_tree_model_sort_convert_child_iter_to_iter (GtkTreeModelSort *tree_model_sor
path = gtk_tree_model_sort_convert_child_path_to_path (tree_model_sort, child_path); path = gtk_tree_model_sort_convert_child_path_to_path (tree_model_sort, child_path);
gtk_tree_path_free (child_path); gtk_tree_path_free (child_path);
g_return_if_fail (path != NULL);
if (!path)
{
g_warning ("%s: The conversion of the child path to a GtkTreeModel sort path failed", G_STRLOC);
return;
}
gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_model_sort), sort_iter, path); gtk_tree_model_get_iter (GTK_TREE_MODEL (tree_model_sort), sort_iter, path);
gtk_tree_path_free (path); gtk_tree_path_free (path);
@ -2259,7 +2265,30 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort,
if (gtk_tree_model_iter_next (tree_model_sort->child_model, &iter) == FALSE && if (gtk_tree_model_iter_next (tree_model_sort->child_model, &iter) == FALSE &&
i < length - 1) i < length - 1)
{ {
g_warning ("There is a discrepancy between the sort model and the child model."); if (parent_level)
{
GtkTreePath *level;
gchar *str;
level = gtk_tree_model_sort_elt_get_path (parent_level,
parent_elt);
str = gtk_tree_path_to_string (level);
gtk_tree_path_free (level);
g_warning ("%s: There is a discrepancy between the sort model "
"and the child model. The child model is "
"advertising a wrong length for level %s:.",
G_STRLOC, str);
g_free (str);
}
else
{
g_warning ("%s: There is a discrepancy between the sort model "
"and the child model. The child model is "
"advertising a wrong length for the root level.",
G_STRLOC);
}
return; return;
} }
} }